Fix mutatingwebhook not deleting error

tharindu1st · Dec 4, 2019 · 2102202 · 2102202
1 parent 2c52459
commit 2102202
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/infrastructure/src/main/resources/kubernetes_destroy.sh b/infrastructure/src/main/resources/kubernetes_destroy.sh
@@ -46,8 +46,8 @@ function delete_resources() {
   echo "running destroy.sh"
   kubectl delete namespaces $namespace
   kubectl delete mutatingwebhookconfiguration "sidecar-injector-webhook-cfg-${namespace}"
-  webhookadded=$(kubectl get mutatingwebhookconfiguration "sidecar-injector-webhook-cfg-${namespace}" -o jsonpath='{.status.conditions[?(@.type=="Available")].status}')
-  if [[ "$webhookadded" == "True" ]]
+  webhookadded=$(kubectl get mutatingwebhookconfiguration "sidecar-injector-webhook-cfg-${namespace}" -o json)
+  if [[ ! -z "$webhookadded" ]]
   then 
      kubectl delete mutatingwebhookconfiguration "sidecar-injector-webhook-cfg-${namespace}"
   fi

diff --git a/infrastructure/src/main/resources/kubernetes_helmDestroy.sh b/infrastructure/src/main/resources/kubernetes_helmDestroy.sh
@@ -44,8 +44,8 @@ read_property_file() {
 function delete_resources() {
   echo "running destroy.sh"
   kubectl delete namespaces $namespace
-  webhookadded=$(kubectl get mutatingwebhookconfiguration "sidecar-injector-webhook-cfg-${namespace}" -o jsonpath='{.status.conditions[?(@.type=="Available")].status}')
-  if [[ "$webhookadded" == "True" ]]
+  webhookadded=$(kubectl get mutatingwebhookconfiguration "sidecar-injector-webhook-cfg-${namespace}" -o json)
+  if [[ ! -z "$webhookadded" ]]
   then 
      kubectl delete mutatingwebhookconfiguration "sidecar-injector-webhook-cfg-${namespace}"
   fi