Fix ns teardown when standard deploy scripts were not used

RedHatInsights · Jan 20, 2022 · bc4fd49 · bc4fd49
1 parent 5c7fb05
commit bc4fd49
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/cicd/_common_deploy_logic.sh b/cicd/_common_deploy_logic.sh
@@ -60,8 +60,13 @@ function teardown {
     echo "----- TEARING DOWN -----"
     echo "------------------------"
     local ns
-    RESERVED_NAMESPACES="$DB_NAMESPACE $SMOKE_NAMESPACE"
-    for ns in $RESERVED_NAMESPACES; do
+
+    # run teardown on all namespaces possibly reserved in this run
+    RESERVED_NAMESPACES=("${NAMESPACE}" "${DB_NAMESPACE}" "${SMOKE_NAMESPACE}")
+    # remove duplicates (https://stackoverflow.com/a/13648438)
+    UNIQUE_NAMESPACES=($(echo "${RESERVED_NAMESPACES[@]}" | tr ' ' '\n' | sort -u | tr '\n' ' '))
+
+    for ns in ${UNIQUE_NAMESPACES[@]}; do
         echo "Running teardown for ns: $ns"
         set +e
         collect_k8s_artifacts $ns