feat: disable Envoy by default

Author: teoincontatto

stackgres-k8s/e2e/spec/ssl

@@ -66,9 +66,9 @@ ssl_check() {
   local EXIT_CODE RESULT
   while [ "$RETRY" -gt 0 ]
   do
-    if ! wait_until -t "$((E2E_TIMEOUT / 4))" run_query -m require -h "$CLUSTER_NAME" -i 1 -p 5432
+    if ! kubectl get sgcluster -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME" -o json | jq .spec.pods.disableEnvoy | grep -qxF true
     then
-      if ! kubectl get sgcluster -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME" -o json | jq .spec.pods.disableEnvoy | grep -qxF true
+      if ! wait_until -t "$((E2E_TIMEOUT / 4))" run_query -m require -h "$CLUSTER_NAME" -i 1 -p 5432
       then
         echo "WARNING: SSL was not updated automatically... seems an envoy bug, will restart it"
         kubectl delete pod -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME-0"
@@ -93,16 +93,16 @@ ssl_check() {
     local EXIT_CODE RESULT
     while [ "$RETRY" -gt 0 ]
     do
-      if ! wait_until -t "$((E2E_TIMEOUT / 4))" run_query -m require -h "$CLUSTER_NAME"-replicas -i 0 -p 5432
+      if ! kubectl get sgcluster -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME" -o json | jq .spec.pods.disableEnvoy | grep -qxF true
       then
-        if ! kubectl get sgcluster -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME" -o json | jq .spec.pods.disableEnvoy | grep -qxF true
+        if ! wait_until -t "$((E2E_TIMEOUT / 4))" run_query -m require -h "$CLUSTER_NAME"-replicas -i 0 -p 5432
         then
           echo "WARNING: SSL was not updated automatically... seems an envoy bug, will restart it"
+          kubectl delete pod -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME-1"
+          wait_pods_running "$CLUSTER_NAMESPACE" 2
+          wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
+          switch_cluster_to_first "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
         fi
-        kubectl delete pod -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME-1"
-        wait_pods_running "$CLUSTER_NAMESPACE" 2
-        wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
-        switch_cluster_to_first "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
       fi
       try_function wait_until -t "$((E2E_TIMEOUT / 4))" run_query -m require -h "$CLUSTER_NAME"-replicas -i 0 -p 5432
       if "$RESULT"

stackgres-k8s/e2e/utils/connectivity

@@ -4,14 +4,23 @@ check_connectivity(){
   RESPONSE_5432="$(wait_until run_query -p 5432 "$@")"
   RESPONSE_6432="$(wait_until run_query -p 6432 "$@")"
 
-  RESPONSE_7432="$(wait_until run_query -p 7432 "$@")"
-  RESPONSE_7433="$(wait_until run_query -p 7433 "$@")"
-  
-  if [ "$RESPONSE_5432" = "1" ] && [ "$RESPONSE_6432" = "1" ] && [ "$RESPONSE_7432" = "1" ] && [ "$RESPONSE_7433" = "1" ]
+  if ! kubectl get sgcluster -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME" -o json | jq .spec.pods.disableEnvoy | grep -qxF true
   then
-    return 0
-  else 
-    return 1
+    RESPONSE_7432="$(wait_until run_query -p 7432 "$@")"
+    RESPONSE_7433="$(wait_until run_query -p 7433 "$@")"
+    if [ "$RESPONSE_5432" = "1" ] && [ "$RESPONSE_6432" = "1" ] && [ "$RESPONSE_7432" = "1" ] && [ "$RESPONSE_7433" = "1" ]
+    then
+      return 0
+    else 
+      return 1
+    fi
+  else
+    if [ "$RESPONSE_5432" = "1" ] && [ "$RESPONSE_6432" = "1" ]
+    then
+      return 0
+    else 
+      return 1
+    fi
   fi
 }