Reorg objects deleted in uninstall command (#389)

stashed · Mar 24, 2018 · 2f29b8d · 2f29b8d
1 parent 8a44a74
commit 2f29b8d
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/hack/deploy/stash.sh b/hack/deploy/stash.sh
@@ -162,16 +162,18 @@ while test $# -gt 0; do
 done
 
 if [ "$STASH_UNINSTALL" -eq 1 ]; then
+    # delete webhooks and apiservices
+    kubectl delete validatingwebhookconfiguration -l app=stash
+    kubectl delete mutatingwebhookconfiguration -l app=stash
+    kubectl delete apiservice -l app=stash
+    # delete stash operator
     kubectl delete deployment -l app=stash --namespace $STASH_NAMESPACE
     kubectl delete service -l app=stash --namespace $STASH_NAMESPACE
     kubectl delete secret -l app=stash --namespace $STASH_NAMESPACE
-    kubectl delete validatingwebhookconfiguration -l app=stash --namespace $STASH_NAMESPACE
-    kubectl delete mutatingwebhookconfiguration -l app=stash --namespace $STASH_NAMESPACE
-    kubectl delete apiservice -l app=stash --namespace $STASH_NAMESPACE
-    # Delete RBAC objects, if --rbac flag was used.
+    # delete RBAC objects, if --rbac flag was used.
     kubectl delete serviceaccount -l app=stash --namespace $STASH_NAMESPACE
-    kubectl delete clusterrolebindings -l app=stash --namespace $STASH_NAMESPACE
-    kubectl delete clusterrole -l app=stash --namespace $STASH_NAMESPACE
+    kubectl delete clusterrolebindings -l app=stash
+    kubectl delete clusterrole -l app=stash
     kubectl delete rolebindings -l app=stash --namespace $STASH_NAMESPACE
     kubectl delete role -l app=stash --namespace $STASH_NAMESPACE