bootkube.sh: do not hide problems with render

openshift · Feb 20, 2019 · d38bf94 · d38bf94
1 parent 1c16da0
commit d38bf94
Showing 1 changed file with 19 additions and 20 deletions.
diff --git a/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template b/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
@@ -46,13 +46,12 @@ then
  "${release}" \
  render \
  --output-dir=/assets/cvo-bootstrap \
- --release-image="${release}"
+ --release-image="${release}" &&
 
- cp cvo-bootstrap/bootstrap/* bootstrap-manifests/
- cp cvo-bootstrap/manifests/* manifests/
- ## FIXME: CVO should use `/etc/kubernetes/bootstrap-secrets/kubeconfig` instead
- cp auth/kubeconfig /etc/kubernetes/kubeconfig
-fi
+ cp cvo-bootstrap/bootstrap/* bootstrap-manifests/ &&
+ cp cvo-bootstrap/manifests/* manifests/ &&
+ cp auth/kubeconfig /etc/kubernetes/kubeconfig # FIXME: CVO should use `/etc/kubernetes/bootstrap-secrets/kubeconfig` instead
+fi || { rm -rf cvo-bootstrap; false; }
 
 if [ ! -d config-bootstrap ]
 then
@@ -65,10 +64,10 @@ then
  /usr/bin/cluster-config-operator render \
  --config-output-file=/assets/config-bootstrap/config \
  --asset-input-dir=/assets/tls \
- --asset-output-dir=/assets/config-bootstrap
+ --asset-output-dir=/assets/config-bootstrap &&
 
  cp config-bootstrap/manifests/* manifests/
-fi
+fi || { rm -rf config-bootstrap; false; }
 
 if [ ! -d kube-apiserver-bootstrap ]
 then
@@ -85,12 +84,12 @@ then
  --asset-input-dir=/assets/tls \
  --asset-output-dir=/assets/kube-apiserver-bootstrap \
  --config-output-file=/assets/kube-apiserver-bootstrap/config \
- --cluster-config-file=/assets/openshift/99_openshift-cluster-api_cluster.yaml
+ --cluster-config-file=/assets/openshift/99_openshift-cluster-api_cluster.yaml &&
 
- cp kube-apiserver-bootstrap/config /etc/kubernetes/bootstrap-configs/kube-apiserver-config.yaml
- cp kube-apiserver-bootstrap/bootstrap-manifests/* bootstrap-manifests/
+ cp kube-apiserver-bootstrap/config /etc/kubernetes/bootstrap-configs/kube-apiserver-config.yaml &&
+ cp kube-apiserver-bootstrap/bootstrap-manifests/* bootstrap-manifests/ &&
  cp kube-apiserver-bootstrap/manifests/* manifests/
-fi
+fi || { rm -rf kube-apiserver-bootstrap; false; }
 
 if [ ! -d kube-controller-manager-bootstrap ]
 then
@@ -105,12 +104,12 @@ then
  --asset-input-dir=/assets/tls \
  --asset-output-dir=/assets/kube-controller-manager-bootstrap \
  --config-output-file=/assets/kube-controller-manager-bootstrap/config \
- --cluster-config-file=/assets/openshift/99_openshift-cluster-api_cluster.yaml
+ --cluster-config-file=/assets/openshift/99_openshift-cluster-api_cluster.yaml &&
 
- cp kube-controller-manager-bootstrap/config /etc/kubernetes/bootstrap-configs/kube-controller-manager-config.yaml
- cp kube-controller-manager-bootstrap/bootstrap-manifests/* bootstrap-manifests/
+ cp kube-controller-manager-bootstrap/config /etc/kubernetes/bootstrap-configs/kube-controller-manager-config.yaml &&
+ cp kube-controller-manager-bootstrap/bootstrap-manifests/* bootstrap-manifests/ &&
  cp kube-controller-manager-bootstrap/manifests/* manifests/
-fi
+fi || { rm -rf kube-controller-manager-bootstrap; false; }
 
 if [ ! -d kube-scheduler-bootstrap ]
 then
@@ -124,12 +123,12 @@ then
  --manifest-image=${OPENSHIFT_HYPERKUBE_IMAGE} \
  --asset-input-dir=/assets/tls \
  --asset-output-dir=/assets/kube-scheduler-bootstrap \
- --config-output-file=/assets/kube-scheduler-bootstrap/config
+ --config-output-file=/assets/kube-scheduler-bootstrap/config &&
 
- cp kube-scheduler-bootstrap/config /etc/kubernetes/bootstrap-configs/kube-scheduler-config.yaml
- cp kube-scheduler-bootstrap/bootstrap-manifests/* bootstrap-manifests/
+ cp kube-scheduler-bootstrap/config /etc/kubernetes/bootstrap-configs/kube-scheduler-config.yaml &&
+ cp kube-scheduler-bootstrap/bootstrap-manifests/* bootstrap-manifests/ &&
  cp kube-scheduler-bootstrap/manifests/* manifests/
-fi
+fi || { rm -rf kube-scheduler-bootstrap; false; }
 
 if [ ! -d mco-bootstrap ]
 then