bin: delete admin-rbac last in clean scripts

elastisys · Nov 22, 2024 · 60a88b3 · 60a88b3
1 parent 707258c
commit 60a88b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/scripts/clean-sc.sh b/scripts/clean-sc.sh
@@ -37,7 +37,7 @@ fi
 "${here}/.././bin/ck8s" ops velero sc uninstall
 
 # Destroy all helm releases
-"${here}/.././bin/ck8s" ops helmfile sc -l app!=cert-manager destroy
+"${here}/.././bin/ck8s" ops helmfile sc -l app!=cert-manager -l app!=admin-rbac destroy
 
 # Clean up namespaces and any other resources left behind by the apps
 "${here}/.././bin/ck8s" ops kubectl sc delete ns dex opensearch-system harbor fluentd-system gatekeeper-system thanos ingress-nginx monitoring kured falco velero
@@ -132,3 +132,5 @@ if [ -n "$GATE_CONS" ]; then
     # shellcheck disable=SC2086
     "${here}/.././bin/ck8s" ops kubectl sc delete --ignore-not-found=true $GATE_CONS
 fi
+
+"${here}/.././bin/ck8s" ops helmfile sc -l app=admin-rbac destroy
diff --git a/scripts/clean-wc.sh b/scripts/clean-wc.sh
@@ -49,7 +49,7 @@ fi
 "${here}/.././bin/ck8s" ops velero wc uninstall
 
 # Destroy all helm releases
-"${here}/.././bin/ck8s" ops helmfile wc -l app!=cert-manager destroy
+"${here}/.././bin/ck8s" ops helmfile wc -l app!=cert-manager -l app!=admin-rbac destroy
 
 # Clean up namespaces and any other resources left behind by the apps
 "${here}/.././bin/ck8s" ops kubectl wc delete ns alertmanager falco fluentd-system fluentd gatekeeper-system hnc-system ingress-nginx monitoring velero kured
@@ -120,3 +120,5 @@ mapfile -t HNC_CRDS < <("${here}/.././bin/ck8s" ops kubectl wc api-resources --a
 if [[ "${#HNC_CRDS[@]}" -gt 0 ]]; then
     "${here}/.././bin/ck8s" ops kubectl wc delete crds "${HNC_CRDS[@]}"
 fi
+
+"${here}/.././bin/ck8s" ops helmfile wc -l app=admin-rbac destroy