e2e: check all SGConfig related jobs are cleaned up

Author: teoincontatto

stackgres-k8s/e2e/spec/dbops-security-upgrade-olm

@@ -339,6 +339,13 @@ EOF
 }
 
 e2e_upgrade_operator() {
+  SGCONFIG_NAMESPACE="$OPERATOR_NAMESPACE"
+  if [ "x$E2E_ALLOWED_NAMESPACES" != x ] \
+    && ! printf ' %s ' "$E2E_ALLOWED_NAMESPACES" | grep -qF " $OPERATOR_NAMESPACE "
+  then
+    SGCONFIG_NAMESPACE="$CLUSTER_NAMESPACE"
+  fi
+
   echo "Upgrading operator bundle ($STACKGRES_VERSION)"
 
   if [ "$STACKGRES_PREVIOUS_VERSION" = 1.6.0 ]
@@ -480,13 +487,6 @@ INNER_EOF
 )
 EOF
 
-  SGCONFIG_NAMESPACE="$OPERATOR_NAMESPACE"
-  if [ "x$E2E_ALLOWED_NAMESPACES" != x ] \
-    && ! printf ' %s ' "$E2E_ALLOWED_NAMESPACES" | grep -qF " $OPERATOR_NAMESPACE "
-  then
-    SGCONFIG_NAMESPACE="$CLUSTER_NAMESPACE"
-  fi
-
   EXTRA_OPTS="$(printf %s "
         -Dquarkus.log.category.\"io.stackgres\".level=DEBUG 
         -Dquarkus.log.category.\"io.quarkus\".level=INFO 
@@ -515,12 +515,12 @@ EOF
         {"name":"JAVA_OPTS","value":$EXTRA_OPTS},
         {"name":"APP_OPTS","value":$EXTRA_OPTS},
         {"name":"SGCONFIG","value":$(yq --arg sgconfig "${E2E_OPERATOR_BUNDLE_SGCONFIG:-{\}}" '($sgconfig | fromjson) * . | tostring' "$LOG_PATH/sgconfig-patch.yaml")}
-        ,
 $(
   if [ "x$E2E_ALLOWED_NAMESPACES" != x ] \
     && ! printf ' %s ' "$E2E_ALLOWED_NAMESPACES" | grep -qF " $OPERATOR_NAMESPACE "
   then
     cat << INNER_EOF
+        ,
         {"name":"SGCONFIG_NAMESPACE","value":"$CLUSTER_NAMESPACE"}
 INNER_EOF
   fi
@@ -578,7 +578,7 @@ EOF
     echo "SUCCESS. The StackGres restapi service was available."
   fi
 
-  if ! wait_until eval 'kubectl get job -n "$SGCONFIG_NAMESPACE" -l "app=StackGresConfig" -o name | grep -qxF 0'
+  if ! wait_until eval 'kubectl get job -n "$SGCONFIG_NAMESPACE" -l "app=StackGresConfig" -o name | wc -l | grep -qxF 0'
   then
     echo "FAILED. The StackGres jobs still running."
     return 1

stackgres-k8s/e2e/spec/operator-olm

@@ -51,6 +51,13 @@ e2e_test() {
 }
 
 check_operator_install() {
+  SGCONFIG_NAMESPACE="$OPERATOR_NAMESPACE"
+  if [ "x$E2E_ALLOWED_NAMESPACES" != x ] \
+    && ! printf ' %s ' "$E2E_ALLOWED_NAMESPACES" | grep -qF " $OPERATOR_NAMESPACE "
+  then
+    SGCONFIG_NAMESPACE="$CLUSTER_NAMESPACE"
+  fi
+
   install_operator_olm
 
   check_operator_installed
@@ -202,13 +209,6 @@ EOF
         -Dquarkus.log.category.\"io.stackgres.operator.conciliation\".level=TRACE 
     " | tr -s ' \n' ' ' | jq -s -R .)"
 
-  SGCONFIG_NAMESPACE="$OPERATOR_NAMESPACE"
-  if [ "x$E2E_ALLOWED_NAMESPACES" != x ] \
-    && ! printf ' %s ' "$E2E_ALLOWED_NAMESPACES" | grep -qF " $OPERATOR_NAMESPACE "
-  then
-    SGCONFIG_NAMESPACE="$CLUSTER_NAMESPACE"
-  fi
-
   cat << EOF > "$LOG_PATH/stackgres-subscription-$STACKGRES_VERSION.yaml"
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
@@ -303,7 +303,7 @@ check_operator_installed() {
     echo "SUCCESS. The StackGres restapi service was available."
   fi
 
-  if ! wait_until eval 'kubectl get job -n "$SGCONFIG_NAMESPACE" -l "app=StackGresConfig" -o name | grep -qxF 0'
+  if ! wait_until eval 'kubectl get job -n "$SGCONFIG_NAMESPACE" -l "app=StackGresConfig" -o name | wc -l | grep -qxF 0'
   then
     echo "FAILED. The StackGres jobs still running."
     return 1
@@ -431,6 +431,13 @@ create_or_replace_cluster_from_backup() {
 }
 
 check_operator_delete() {
+  SGCONFIG_NAMESPACE="$OPERATOR_NAMESPACE"
+  if [ "x$E2E_ALLOWED_NAMESPACES" != x ] \
+    && ! printf ' %s ' "$E2E_ALLOWED_NAMESPACES" | grep -qF " $OPERATOR_NAMESPACE "
+  then
+    SGCONFIG_NAMESPACE="$CLUSTER_NAMESPACE"
+  fi
+
   kubectl delete subscription -n "$OPERATOR_NAMESPACE" stackgres
 
   kubectl delete clusterserviceversion -n "$OPERATOR_NAMESPACE" "stackgres.v$BUNDLE_STACKGRES_VERSION"

stackgres-k8s/e2e/utils/operator

@@ -830,7 +830,7 @@ before_operator_install_or_upgrade() {
 after_operator_install_or_upgrade() {
   wait_services_available "$OPERATOR_NAMESPACE" 1 '^stackgres-operator$'
   wait_services_available "$OPERATOR_NAMESPACE" 1 '^stackgres-restapi$'
-  wait_until eval 'kubectl get job -n "$SGCONFIG_NAMESPACE" -l "app=StackGresConfig" -o name | grep -qxF 0'
+  wait_until eval 'kubectl get job -n "$OPERATOR_NAMESPACE" -l "app=StackGresConfig" -o name | wc -l | grep -qxF 0'
   if [ "$OPERATOR_FROM" != true ] && [ "$EXTENSIONS_CACHE_ENABLED" = true ]
   then
     wait_services_available "$OPERATOR_NAMESPACE" 1 '^stackgres-operator-extensions-cache$'