K8SPSMDB-1498 EKS and OPenshift test fixes (#2255)

Author: jvpasinatto

e2e-tests/demand-backup-eks-credentials-irsa/run

@@ -53,7 +53,8 @@ create_infra "$namespace"
 desc "create secrets and start client"
 kubectl_bin apply \
 	-f "$conf_dir/secrets.yml" \
-	-f "$conf_dir/client.yml"
+	-f "$conf_dir/client.yml" \
+	-f "$conf_dir/cloud-secret.yml"
 
 desc "create PSMDB cluster $cluster"
 apply_cluster $test_dir/conf/$cluster.yml
@@ -118,6 +119,7 @@ desc 'check backup and restore -- aws-s3'
 backup_dest_aws=$(get_backup_dest "$backup_name_aws")
 setup_aws_credentials
 check_backup_existence_aws "$backup_dest_aws" "/rs0/myApp.test.gz"
+unset AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY
 run_mongo 'use myApp\n db.test.insert({ x: 100501 })' "myApp:myPass@$cluster-rs0.$namespace"
 compare_mongo_cmd "find" "myApp:myPass@$cluster-rs0-0.$cluster-rs0.$namespace" "-2nd"
 compare_mongo_cmd "find" "myApp:myPass@$cluster-rs0-1.$cluster-rs0.$namespace" "-2nd"

e2e-tests/non-voting-and-hidden/compare/statefulset_some-name-rs0-hidden-oc.yml

@@ -114,6 +114,12 @@ spec:
                 - readiness
                 - --component
                 - mongod
+                - --ssl
+                - --sslInsecure
+                - --sslCAFile
+                - /etc/mongodb-ssl/ca.crt
+                - --sslPEMKeyFile
+                - /tmp/tls.pem
             failureThreshold: 8
             initialDelaySeconds: 10
             periodSeconds: 3

e2e-tests/pvc-auto-resize/conf/some-name-eks.yml

@@ -0,0 +1,40 @@
+apiVersion: psmdb.percona.com/v1
+kind: PerconaServerMongoDB
+metadata:
+  name: some-name
+  finalizers:
+    - percona.com/delete-psmdb-pods-in-order
+    - percona.com/delete-psmdb-pvc
+spec:
+  image:
+  imagePullPolicy: Always
+  allowUnsafeConfigurations: false
+  storageScaling:
+    enableVolumeScaling: true
+    autoscaling:
+      enabled: true
+      triggerThresholdPercent: 50
+      growthStep: "2Gi"
+      maxSize: "10Gi"
+  backup:
+    enabled: false
+  replsets:
+  - name: rs0
+    affinity:
+      antiAffinityTopologyKey: none
+    resources:
+      limits:
+        cpu: 500m
+        memory: 0.5G
+      requests:
+        cpu: 100m
+        memory: 0.1G
+    volumeSpec:
+      persistentVolumeClaim:
+        storageClassName: gp2-resizable
+        resources:
+          requests:
+            storage: 1G
+    size: 3
+  secrets:
+    users: some-users

e2e-tests/pvc-auto-resize/run

@@ -126,7 +126,11 @@ kubectl_bin apply \
 
 desc 'create PSMDB cluster with storageAutoscaling enabled'
 cluster="some-name"
-spinup_psmdb "${cluster}-rs0" "$test_dir/conf/$cluster.yml"
+if [ "$EKS" == 1 ]; then
+	spinup_psmdb "${cluster}-rs0" "$test_dir/conf/$cluster-eks.yml"
+else
+	spinup_psmdb "${cluster}-rs0" "$test_dir/conf/$cluster.yml"
+fi
 
 desc 'verify initial PVC size is 1Gi'
 initial_size=$(get_pvc_size "mongod-data-${cluster}-rs0-0")
@@ -156,11 +160,11 @@ wait_cluster_consistency "$cluster" 64
 desc 'verify cluster is ready'
 kubectl_bin get psmdb "${cluster}" -o jsonpath='{.status.state}' | grep -q "ready"
 
-if [[ -n ${OPENSHIFT} ]]; then
-	# On OpenShift (AWS), EBS volumes can only be expanded once every 6 hours.
+if [[ -n ${OPENSHIFT} || "$EKS" == 1 ]]; then
+	# On AWS (OpenShift/EKS), EBS volumes can only be expanded once every 6 hours.
 	# Skip the multi-resize quota and maxSize tests since they require
 	# multiple sequential resizes of the same volume.
-	echo "OpenShift detected, skipping multi-resize tests (AWS EBS rate limit)"
+	echo "OpenShift/AWS environment detected, skipping multi-resize tests (EBS rate limit)"
 	destroy "${namespace}"
 	desc "test passed"
 	exit 0

e2e-tests/pvc-resize/run

@@ -49,6 +49,7 @@ function apply_resourcequota() {
 function wait_cluster_status() {
 	local cluster=$1
 	local expected=$2
+	local retry=0
 
 	echo -n "Waiting for psmdb/${cluster} status to be ${expected}"
 	until [[ $(kubectl_bin get psmdb "${cluster}" -o jsonpath='{.status.state}') == "${expected}" ]]; do
@@ -159,6 +160,20 @@ wait_cluster_status ${cluster} "error"
 patch_pvc_request "${cluster}" "3G"
 wait_cluster_status ${cluster} "ready"
 
+if [[ $EKS == 1 || -n ${OPENSHIFT} ]]; then
+	echo "Deleting and recreating PSMDB cluster ${cluster} to avoid cloud storage resize cooldown"
+	kubectl_bin delete psmdb ${cluster}
+	kubectl_bin apply -f "$conf_dir/secrets.yml"
+	if [ "$EKS" == 1 ]; then
+		spinup_psmdb "${cluster}-rs0" "$test_dir/conf/$cluster-eks.yml"
+	else
+		spinup_psmdb "${cluster}-rs0" "$test_dir/conf/$cluster.yml"
+	fi
+	kubectl_bin patch psmdb "${cluster}" --type=json -p='[{"op": "add", "path": "/spec/storageScaling", "value":{"enableVolumeScaling":true} }]'
+	sleep 10
+	wait_cluster_consistency "$cluster"
+fi
+
 desc "test restartedAt annotation preservation during PVC resize"
 
 echo "delete resourcequota"