fix tests

Author: jvpasinatto

e2e-tests/functions

@@ -2537,16 +2537,21 @@ function create_k8s_cluster() {
 	local platform="$3"
 	local region="$4"
 	local ttl="${5:-"1"}"
+	local gke_machine_type="${K8S_UPGRADE_MACHINE_TYPE:-n1-standard-4}"
+	local doks_node_size="${K8S_UPGRADE_NODE_SIZE:-s-4vcpu-16gb-amd}"
+	if [[ ${ARCH} == arm64 ]]; then
+		gke_machine_type="${K8S_UPGRADE_MACHINE_TYPE:-t2a-standard-4}"
+	fi
 
 	case "$platform" in
 
 		doks)
-			echo "Creating DOKS cluster: $name ($version)"
+			echo "Creating DOKS cluster: $name ($version, size=$doks_node_size)"
 			creation_time=$(date +%s)
 			doctl kubernetes cluster create "$name" \
 				--region "$region" \
 				--version "$version" \
-				--size "s-4vcpu-16gb-amd" \
+				--size "$doks_node_size" \
 				--count "3" \
 				--tag "delete-cluster-after-hours:$ttl" \
 				--tag "creation-time:$creation_time" \
@@ -2563,13 +2568,13 @@ function create_k8s_cluster() {
 			;;
 
 		gke)
-			echo "Creating GKE cluster: $name ($version)"
+			echo "Creating GKE cluster: $name ($version, machine-type=$gke_machine_type)"
 			gcloud container clusters create "$name" \
 				--zone "$region" \
 				--cluster-ipv4-cidr=/21 \
 				--cluster-version "$version" \
 				--num-nodes "3" \
-				--machine-type "n1-standard-4" \
+				--machine-type "$gke_machine_type" \
 				--labels="delete-cluster-after-hours=$ttl,team=cloud,product=pg-operator" \
 				--no-enable-autoupgrade \
 				--monitoring=NONE \

e2e-tests/tests/custom-extensions/00-deploy-operator.yaml

@@ -13,4 +13,4 @@ commands:
       deploy_client
       deploy_s3_secrets
       deploy_minio
-      copy_custom_extensions_form_aws
+      copy_custom_extensions_from_aws

e2e-tests/tests/major-upgrade-logical-replica/04-add-logical-replica.yaml

@@ -8,18 +8,17 @@ commands:
 
       source ../../functions
 
-      kubectl -n "${NAMESPACE}" patch pg major-upgrade-logical-replica --type=merge --patch '{
-        "spec": {
-          "logicalReplicas": [
-            {
-              "name": "analytics",
-              "databases": ["myapp"],
-              "bootstrapMethod": "pgbackrest",
-              "dataVolumeClaimSpec": {
-                "accessModes": ["ReadWriteOnce"],
-                "resources": {"requests": {"storage": "1Gi"}}
-              }
-            }
-          ]
-        }
-      }'
+      merge_patch_pg major-upgrade-logical-replica <<EOF
+      apiVersion: pgv2.percona.com/v2
+      kind: PerconaPGCluster
+      spec:
+        logicalReplicas:
+        - name: analytics
+          databases: ["myapp"]
+          bootstrapMethod: pgbackrest
+          dataVolumeClaimSpec:
+            accessModes: ["ReadWriteOnce"]
+            resources:
+              requests:
+                storage: 1Gi
+      EOF

e2e-tests/tests/major-upgrade-logical-replica/05-upgrade.yaml

@@ -7,7 +7,7 @@ commands:
 
       source ../../functions
 
-      kubectl apply -n ${NAMESPACE} -f - <<-EOF
+      add_arch_to_pg_upgrade - <<-EOF | kubectl apply -n ${NAMESPACE} -f -
         apiVersion: pgv2.percona.com/v2
         kind: PerconaPGUpgrade
         metadata:

e2e-tests/tests/major-upgrade-logical-replica/08-reseed-logical-replica.yaml

@@ -31,18 +31,17 @@ commands:
       retry 60 5 status_gone
       retry 60 5 objects_gone
 
-      kubectl -n "${NAMESPACE}" patch pg major-upgrade-logical-replica --type=merge --patch '{
-        "spec": {
-          "logicalReplicas": [
-            {
-              "name": "analytics",
-              "databases": ["myapp"],
-              "bootstrapMethod": "pgbackrest",
-              "dataVolumeClaimSpec": {
-                "accessModes": ["ReadWriteOnce"],
-                "resources": {"requests": {"storage": "1Gi"}}
-              }
-            }
-          ]
-        }
-      }'
+      merge_patch_pg major-upgrade-logical-replica <<EOF
+      apiVersion: pgv2.percona.com/v2
+      kind: PerconaPGCluster
+      spec:
+        logicalReplicas:
+        - name: analytics
+          databases: ["myapp"]
+          bootstrapMethod: pgbackrest
+          dataVolumeClaimSpec:
+            accessModes: ["ReadWriteOnce"]
+            resources:
+              requests:
+                storage: 1Gi
+      EOF

e2e-tests/tests/monitoring/00-assert.yaml

@@ -1,24 +1,27 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 120
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: perconapgclusters.pgv2.percona.com
-spec:
-  group: pgv2.percona.com
-  names:
-    kind: PerconaPGCluster
-    listKind: PerconaPGClusterList
-    plural: perconapgclusters
-    singular: perconapgcluster
-  scope: Namespaced
----
-apiVersion: kuttl.dev/v1beta1
-kind: TestAssert
 metadata:
   name: check-operator-deploy-status
 timeout: 120
 commands:
-  - script: kubectl assert exist-enhanced deployment percona-postgresql-operator -n ${OPERATOR_NS:-$NAMESPACE} --field-selector status.readyReplicas=1
+  - script: |
+      set -o errexit
+      set -o xtrace
+
+      source ../../functions
+
+      if [[ ${ARCH} == arm64 ]]; then
+        echo "Skipping monitoring test on arm64: PMM server does not support ARM"
+        exit 0
+      fi
+
+      until kubectl assert exist-enhanced crd perconapgclusters.pgv2.percona.com; do
+        echo "Waiting for PerconaPGCluster CRD"
+        sleep 5
+      done
+
+      until kubectl assert exist-enhanced deployment percona-postgresql-operator \
+        -n "${OPERATOR_NS:-$NAMESPACE}" --field-selector status.readyReplicas=1; do
+        echo "Waiting for percona-postgresql-operator deployment"
+        sleep 5
+      done

e2e-tests/tests/monitoring/00-deploy-operator.yaml

@@ -7,6 +7,12 @@ commands:
       set -o xtrace
 
       source ../../functions
+
+      if [[ ${ARCH} == arm64 ]]; then
+        echo "Skipping monitoring test on arm64: PMM server does not support ARM"
+        exit 0
+      fi
+
       init_temp_dir # do this only in the first TestStep
 
       deploy_operator

e2e-tests/tests/monitoring/01-assert.yaml

@@ -3,6 +3,17 @@ kind: TestAssert
 timeout: 520
 commands:
   - script: |
+      set -o errexit
+      set -o xtrace
+
+      source ../../functions
+
+      if [[ ${ARCH} == arm64 ]]; then
+        echo "Skipping monitoring test on arm64: PMM server does not support ARM"
+        exit 0
+      fi
+
+      set +o errexit
       set +o xtrace
 
       load_balancer=""
@@ -11,20 +22,11 @@ commands:
           | jq -r '.status.loadBalancer.ingress[0] | .ip // .hostname // empty')
         [ -n "${load_balancer}" ] || sleep 5
       done
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: monitoring
-status:
-  collisionCount: 0
-  currentReplicas: 1
-  observedGeneration: 1
-  readyReplicas: 1
-  replicas: 1
-  updatedReplicas: 1
----
-kind: Service
-apiVersion: v1
-metadata:
-  name: monitoring-service
+
+      set -o errexit
+
+      until kubectl assert exist-enhanced statefulset monitoring -n "${NAMESPACE}" \
+        --field-selector status.readyReplicas=1; do
+        echo "Waiting for PMM server statefulset"
+        sleep 5
+      done

e2e-tests/tests/monitoring/01-deploy-pmm-server.yaml

@@ -7,5 +7,10 @@ commands:
 
       source ../../functions
 
+      if [[ ${ARCH} == arm64 ]]; then
+        echo "Skipping monitoring test on arm64: PMM server does not support ARM"
+        exit 0
+      fi
+
       deploy_pmm_server
     timeout: 300

e2e-tests/tests/monitoring/02-assert.yaml

@@ -1,8 +1,15 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
----
-apiVersion: v1
-kind: Secret
-type: Opaque
-metadata:
-  name: monitoring-pmm-secret
+commands:
+  - script: |-
+      set -o errexit
+      set -o xtrace
+
+      source ../../functions
+
+      if [[ ${ARCH} == arm64 ]]; then
+        echo "Skipping monitoring test on arm64: PMM server does not support ARM"
+        exit 0
+      fi
+
+      kubectl assert exist-enhanced secret monitoring-pmm-secret -n "${NAMESPACE}"