Add patch guard to certhelper (#3809)

* Swap satori for gofrs * Remove global rbacconfig * Add patch guard
kyma-project · Apr 23, 2019 · 24da38e · 24da38e
1 parent 426e984
commit 24da38e
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/components/xip-patch/certhelper.sh b/components/xip-patch/certhelper.sh
@@ -34,7 +34,16 @@ data:
 EOF
 )
   echo "---> DOMAIN created: ${DOMAIN}, patching configmap"
-  kubectl patch configmap application-connector-overrides --patch "${DOMAIN_YAML}" -n kyma-installer
+  set +e
+  local msg
+  local status
+  msg=$(kubectl patch configmap application-connector-overrides --patch "${DOMAIN_YAML}" -n kyma-installer 2>&1)
+  status=$?
+  set -e
+  if [[ $status -ne 0 ]] && [[ ! "$msg" == *"not patched"* ]]; then
+    echo "$msg"
+    exit $status
+  fi
 }
 
 function generateCerts() {
@@ -51,7 +60,16 @@ data:
 EOF
 )
   echo "---> Certs have been created, creating patching configmap"
-  kubectl patch configmap application-connector-overrides --patch "${TLS_CERT_AND_KEY_YAML}" -n kyma-installer
+  set +e
+  local msg
+  local status
+  msg=$(kubectl patch configmap application-connector-overrides --patch "${TLS_CERT_AND_KEY_YAML}" -n kyma-installer 2>&1)
+  status=$?
+  set -e
+  if [[ $status -ne 0 ]] && [[ ! "$msg" == *"not patched"* ]]; then
+    echo "$msg"
+    exit $status
+  fi
 }
 
 function createOverrideCM() {