e2e: fix previous tests

Author: teoincontatto

stackgres-k8s/e2e/spec/previous/1.14/spec/abstract/dbops-major-version-upgrade

@@ -102,12 +102,6 @@ reset_cluster_internal() {
       "$@"
   fi
 
-  if [ -n "$DISTRIBUTEDLOGS_NAME" ]
-  then
-    kubectl create secret generic -n "$CLUSTER_NAMESPACE" "$DISTRIBUTEDLOGS_NAME" \
-      --from-literal=superuser-password="$RANDOM"
-  fi
-  
   wait_pods_running "$CLUSTER_NAMESPACE" "$PODS_RUNNING"
   wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
   switch_cluster_to_first "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"

stackgres-k8s/e2e/spec/previous/1.14/spec/abstract/patroni

@@ -51,7 +51,7 @@ patroni_readiness_check() {
 }
 
 get_pod_ip(){
-  kubectl get pods -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME"-0 -o wide | tail -n 1 | awk '{ print $6 }'
+  kubectl get pods -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME"-0 -o json | jq -r .status.podIP
 }
 
 patroni_curl(){

stackgres-k8s/e2e/spec/previous/1.14/spec/connectivity

@@ -71,6 +71,7 @@ EOF
   kubectl delete pod -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME-0" "$CLUSTER_NAME-1"
   wait_pods_running "$CLUSTER_NAMESPACE" 3
   wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
+  switch_cluster_to_first "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
 
   if wait_until check_password_is_required
   then
@@ -170,6 +171,7 @@ pgbouncer_users_check() {
   kubectl delete pod -n "$CLUSTER_NAMESPACE" -l "app=StackGresCluster,stackgres.io/cluster-name=$CLUSTER_NAME,stackgres.io/cluster=true"
   wait_pods_running "$CLUSTER_NAMESPACE" 3
   wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
+  switch_cluster_to_first "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
 
   RESPONSE_REPLICA="$(wait_until run_query -h "$CLUSTER_NAME" -i 1 -p 5432 -u user1:test || true)"
   if [ "$RESPONSE_REPLICA" = "1" ]

stackgres-k8s/e2e/spec/previous/1.14/spec/custom-annotations

@@ -133,8 +133,6 @@ helm_custom_annotations(){
     --set cluster.distributedLogs.sgDistributedLogs="$DISTRIBUTEDLOGS_NAME" \
     --set distributedLogs.metadata.annotations.clusterPods.test-annotation="$POD_RANDOM_VALUE" \
     --set distributedLogs.metadata.annotations.services.service-annotation="$SERVICE_RANDOM_VALUE"
-  kubectl create secret generic -n "$CLUSTER_NAMESPACE" "$DISTRIBUTEDLOGS_NAME" \
-    --from-literal=superuser-password="$RANDOM"
 
   wait_until check_sts_annotation "$POD_RANDOM_VALUE"