f

openshift · Mar 1, 2018 · 5861580 · 5861580
1 parent de25876
commit 5861580
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/pkg/oc/bootstrap/clusterup/componentinstall/apply_list.go b/pkg/oc/bootstrap/clusterup/componentinstall/apply_list.go
@@ -25,9 +25,12 @@ type List struct {
 
 const listBashScript = `#!/bin/sh
 set -e
+set -x
+
+ls -alh /
 
 ns=""
-if [ -f /namespace-file ]; then
+if [ -s /namespace-file ]; then
 	ns="--namespace=$(cat /namespace-file) "
 fi
 

diff --git a/pkg/oc/bootstrap/clusterup/componentinstall/apply_template.go b/pkg/oc/bootstrap/clusterup/componentinstall/apply_template.go
@@ -29,17 +29,20 @@ type Template struct {
 
 const templateBashScript = `#!/bin/sh
 set -e
+set -x
+
+ls -alh /
 
 while read p; do
 	oc adm policy add-scc-to-user --config=/kubeconfig.kubeconfig privileged ${p} --loglevel=8
 done </privileged-sa-list.txt
 
 ns=""
-if [ -f /namespace-file ]; then
+if [ -s /namespace-file ]; then
 	ns="--namespace=$(cat /namespace-file) "
 fi
 
-if [ -f /rbac.yaml ]; then
+if [ -s /rbac.yaml ]; then
 	oc process --local -o yaml --ignore-unknown-parameters --param-file=/param-file.txt -f /rbac.yaml | oc auth reconcile --config=/kubeconfig.kubeconfig -f - 
 fi
 
@@ -68,7 +71,7 @@ func (opt Template) Install(dockerClient dockerhelper.Interface, imageRunHelper
 			HostNetwork().
 			HostPid().
 			Entrypoint("sh").
-			Command("-c", "chmod 755 /install.sh; /install.sh").Run()
+			Command("-c", "echo '"+opt.Name+"'; chmod 755 /install.sh; /install.sh").Run()
 		if err != nil {
 			lastErr = errors.NewError("failed to install %q: %v", opt.Name, err).WithCause(err)
 			return false, nil