K8SPSMDB-1213 Add arm64 support for the e2e tests

e2e-tests/arbiter/run

@@ -74,9 +74,8 @@ main() {
 	deploy_cert_manager
 
 	desc 'create secrets and start client'
-	kubectl_bin apply \
-		-f $conf_dir/client.yml \
-		-f $conf_dir/secrets.yml
+	kubectl_bin apply -f $conf_dir/secrets.yml
+	apply_client $conf_dir/client.yml
 
 	desc 'check arbiter without service-per-pod'
 	check_cr_config "arbiter-rs0"

e2e-tests/balancer/run

@@ -55,9 +55,9 @@ main() {
 
 	desc 'create first PSMDB cluster'
 	cluster="some-name"
-	kubectl_bin apply \
-		-f "$conf_dir/secrets.yml" \
-		-f "$conf_dir/client.yml"
+
+	kubectl_bin apply -f $conf_dir/secrets.yml
+	apply_client $conf_dir/client.yml
 
 	if version_gt "1.19" && [ $EKS -ne 1 ]; then
 		$sed 's/docker/runc/g' "$conf_dir/container-rc.yaml" | kubectl_bin apply -f -

e2e-tests/conf/client.yml

@@ -15,7 +15,7 @@ spec:
       terminationGracePeriodSeconds: 10
       containers:
         - name: psmdb-client
-          image: percona/percona-server-mongodb:4.4
+          image: percona/percona-server-mongodb:4.4-multi
           imagePullPolicy: Always
           command:
           - sleep

e2e-tests/conf/client_with_tls.yml

@@ -15,7 +15,7 @@ spec:
       terminationGracePeriodSeconds: 10
       containers:
         - name: psmdb-client
-          image: percona/percona-server-mongodb:4.4
+          image: percona/percona-server-mongodb:4.4-multi
           imagePullPolicy: Always
           command: ["/bin/bash","-c","cat /etc/mongodb-ssl/tls.key /etc/mongodb-ssl/tls.crt > /tmp/tls.pem && sleep 100500"]
           volumeMounts:

e2e-tests/cross-site-sharded/run

@@ -37,9 +37,8 @@ desc "create main cluster"
 create_infra "$namespace"
 
 desc 'create secrets and start client'
-kubectl_bin apply \
-	-f "$conf_dir/client.yml" \
-	-f "$test_dir/conf/secrets.yml"
+kubectl_bin apply -f $test_dir/conf/secrets.yml
+apply_client $conf_dir/client.yml
 
 desc "create main PSMDB cluster $main_cluster."
 apply_cluster "$test_dir/conf/$main_cluster.yml"

e2e-tests/custom-replset-name/run

@@ -10,7 +10,11 @@ create_infra $namespace
 apply_s3_storage_secrets
 deploy_minio
 
-kubectl_bin apply -f $conf_dir/secrets.yml -f $conf_dir/client.yml -f $conf_dir/minio-secret.yml
+desc 'create secrets and start client'
+kubectl_bin apply -f $conf_dir/secrets.yml
+kubectl_bin apply -f $conf_dir/minio-secret.yml
+apply_client $conf_dir/client.yml
+
 cluster="some-name"
 
 desc 'create first PSMDB cluster'

e2e-tests/custom-tls/run

@@ -32,8 +32,8 @@ main() {
 	destroy_cert_manager || true # We need to be sure that we are getting certificates created by the operator, not by cert-manager
 
 	desc 'create secrets and start client'
-	kubectl_bin apply -f "$conf_dir/secrets.yml"
-	kubectl_bin apply -f "$conf_dir/client_with_tls.yml"
+	kubectl_bin apply -f $conf_dir/secrets.yml
+	apply_client $conf_dir/client_with_tls.yml
 
 	cluster="some-name"
 	desc "create first PSMDB cluster $cluster"

e2e-tests/custom-users-roles-sharded/run

@@ -42,10 +42,9 @@ create_infra "$namespace"
 mongosUri="userAdmin:userAdmin123456@$cluster-mongos.$namespace"
 
 desc 'create secrets and start client'
-kubectl_bin apply -f "${conf_dir}/client.yml" \
-	-f "${conf_dir}/secrets.yml" \
-	-f "${test_dir}/conf/app-user-secrets.yml"
-
+kubectl_bin apply -f $conf_dir/secrets.yml
+kubectl_bin apply -f $test_dir/conf/app-user-secrets.yml
+apply_client $conf_dir/client.yml
 
 apply_s3_storage_secrets
 if version_gt "1.19" && [ $EKS -ne 1 ]; then
@@ -89,7 +88,7 @@ kubectl_bin patch psmdb ${cluster} --type=merge --patch '{
 					"key": "userTwoPassKey"
 				},
 				"roles": [
-					{"db":"admin","name":"userAdminAnyDatabase"}, 
+					{"db":"admin","name":"userAdminAnyDatabase"},
 					{"db":"admin","name":"clusterAdmin"}
 				]
 			}

e2e-tests/custom-users-roles/run

@@ -31,9 +31,9 @@ cluster="some-name-rs0"
 create_infra $namespace
 
 desc 'create secrets and start client'
-kubectl_bin apply -f "${conf_dir}/client.yml" \
-	-f "${conf_dir}/secrets.yml" \
-	-f "${test_dir}/conf/app-user-secrets.yml"
+kubectl_bin apply -f $conf_dir/secrets.yml
+kubectl_bin apply -f $test_dir/conf/app-user-secrets.yml
+apply_client $conf_dir/client.yml
 
 mongoUri="userAdmin:userAdmin123456@$cluster.$namespace"
 
@@ -61,7 +61,7 @@ kubectl_bin patch psmdb ${psmdb} --type=merge --patch '{
 					"key": "userTwoPassKey"
 				},
 				"roles": [
-					{"db":"admin","name":"userAdminAnyDatabase"}, 
+					{"db":"admin","name":"userAdminAnyDatabase"},
 					{"db":"admin","name":"clusterAdmin"}
 				]
 			}

e2e-tests/data-at-rest-encryption/run

@@ -13,7 +13,8 @@ deploy_minio
 apply_s3_storage_secrets
 
 desc 'create secrets and start client'
-kubectl_bin apply -f "$conf_dir/secrets.yml" -f "$conf_dir/client.yml"
+kubectl_bin apply -f $conf_dir/secrets.yml
+apply_client $conf_dir/client.yml
 
 cluster='some-name'
 desc "create PSMDB cluster $cluster"
@@ -57,10 +58,7 @@ sleep 5
 
 desc "check backup and restore -- minio"
 backup_dest_minio=$(get_backup_dest "$backup_name_minio")
-retry 3 8 kubectl_bin run -i --rm aws-cli --image=perconalab/awscli --restart=Never -- \
-	/usr/bin/env AWS_ACCESS_KEY_ID=some-access-key AWS_SECRET_ACCESS_KEY=some-secret-key AWS_DEFAULT_REGION=us-east-1 \
-	/usr/bin/aws --endpoint-url http://minio-service:9000 s3 ls s3://${backup_dest_minio}/rs0/ \
-	| grep myApp.test.gz
+retry 3 8 aws_cli "s3 ls s3://${backup_dest_minio}/rs0/" | grep "myApp.test.gz"
 run_mongos 'use myApp\n db.test.insert({ x: 100501 })' "myApp:myPass@$cluster-mongos.$namespace"
 compare_mongos_cmd "find" "myApp:myPass@$cluster-mongos.$namespace" "-2nd"
 run_restore "$backup_name_minio"

e2e-tests/data-sharded/run

@@ -39,8 +39,8 @@ main() {
 	deploy_cert_manager
 
 	desc 'create secrets and start client'
-	kubectl_bin apply -f "$conf_dir/secrets.yml"
-	kubectl_bin apply -f "$conf_dir/client_with_tls.yml"
+	kubectl_bin apply -f $conf_dir/secrets.yml
+	apply_client $conf_dir/client_with_tls.yml
 
 	cluster="some-name"
 	desc "create first PSMDB cluster $cluster"

e2e-tests/default-cr/run

@@ -48,7 +48,7 @@ function main() {
 
 	desc 'create secrets and start client'
 	kubectl_bin apply -f $deploy_dir/secrets.yaml
-	kubectl_bin apply -f $conf_dir/client.yml
+	apply_client $conf_dir/client.yml
 
 	desc "create first PSMDB cluster $cluster"
 	kubectl_bin apply ${OPERATOR_NS:+-n $OPERATOR_NS} --server-side --force-conflicts -f $deploy_dir/crd.yaml

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

@@ -14,9 +14,8 @@ fi
 create_infra $namespace
 
 desc 'create secrets and start client'
-kubectl_bin apply \
-	-f "$conf_dir/secrets.yml" \
-	-f "$conf_dir/client.yml"
+kubectl_bin apply -f $conf_dir/secrets.yml
+apply_client $conf_dir/client.yml
 
 cluster="some-name-rs0"
 desc "create first PSMDB cluster $cluster"

e2e-tests/demand-backup-physical-sharded/run

@@ -66,11 +66,13 @@ apply_s3_storage_secrets
 ### Case 1: Backup and restore on sharded cluster
 desc 'Testing on sharded cluster'
 
+desc 'create secrets and start client'
+kubectl_bin apply -f $conf_dir/secrets.yml
+apply_client $conf_dir/client_with_tls.yml
+
 echo "Creating PSMDB cluster"
 cluster="some-name"
-kubectl_bin apply -f "${conf_dir}/secrets.yml"
-apply_cluster "${test_dir}/conf/${cluster}-sharded.yml"
-kubectl_bin apply -f "${conf_dir}/client_with_tls.yml"
+apply_cluster $test_dir/conf/$cluster-sharded.yml
 
 echo "check if all pods started"
 wait_for_running ${cluster}-rs0 3

e2e-tests/demand-backup-physical/run

@@ -58,11 +58,13 @@ apply_s3_storage_secrets
 
 desc 'Testing on not sharded cluster'
 
+desc 'create secrets and start client'
+kubectl_bin apply -f $conf_dir/secrets.yml
+apply_client $conf_dir/client_with_tls.yml
+
 echo "Creating PSMDB cluster"
 cluster="some-name"
-kubectl_bin apply -f "${conf_dir}/secrets.yml"
-apply_cluster "${test_dir}/conf/${cluster}.yml"
-kubectl_bin apply -f "${conf_dir}/client_with_tls.yml"
+apply_cluster $test_dir/conf/$cluster.yml
 
 echo "check if all pods started"
 wait_for_running ${cluster}-rs0 3

e2e-tests/demand-backup-sharded/run

@@ -19,11 +19,9 @@ create_infra "$namespace"
 
 deploy_minio
 
-desc 'create first PSMDB cluster'
-cluster="some-name"
-kubectl_bin apply \
-	-f "$conf_dir/secrets.yml" \
-	-f "$conf_dir/client.yml"
+desc 'create secrets and start client'
+kubectl_bin apply -f $conf_dir/secrets.yml
+apply_client $conf_dir/client.yml
 
 apply_s3_storage_secrets
 if version_gt "1.19" && [ $EKS -ne 1 ]; then
@@ -34,6 +32,8 @@ else
 	kubectl_bin apply -f "$conf_dir/container-rc.yaml"
 fi
 
+desc 'create first PSMDB cluster'
+cluster="some-name"
 apply_cluster "$test_dir/conf/$cluster-rs0.yml"
 desc 'check if all 3 Pods started'
 wait_for_running $cluster-rs0 3
@@ -146,10 +146,7 @@ fi
 
 desc 'check backup and restore -- minio'
 backup_dest_minio=$(get_backup_dest "$backup_name_minio")
-kubectl_bin run -i --rm aws-cli --image=perconalab/awscli --restart=Never -- \
-	/usr/bin/env AWS_ACCESS_KEY_ID=some-access-key AWS_SECRET_ACCESS_KEY=some-secret-key AWS_DEFAULT_REGION=us-east-1 \
-	/usr/bin/aws --endpoint-url http://minio-service:9000 s3 ls "s3://${backup_dest_minio}/rs0/" \
-	| grep "myApp.test.gz"
+aws_cli "s3 ls s3://${backup_dest_minio}/rs0/" | grep "myApp.test.gz"
 insert_data_mongos "100501" "myApp"
 insert_data_mongos "100501" "myApp1"
 insert_data_mongos "100501" "myApp2"
@@ -161,10 +158,7 @@ check_data
 desc 'delete backup and check if it is removed from bucket -- minio'
 kubectl_bin delete psmdb-backup --all
 
-backup_exists=$(kubectl_bin run -i --rm aws-cli --image=perconalab/awscli --restart=Never -- \
-	/usr/bin/env AWS_ACCESS_KEY_ID=some-access-key AWS_SECRET_ACCESS_KEY=some-secret-key AWS_DEFAULT_REGION=us-east-1 \
-	/usr/bin/aws --endpoint-url http://minio-service:9000 s3 ls s3://operator-testing/ \
-	| grep -c ${backup_dest_minio}_ | cat)
+backup_exists=$(aws_cli "s3 ls s3://operator-testing/" | grep -c ${backup_dest_minio}_ | cat)
 if [[ $backup_exists -eq 1 ]]; then
 	echo "Backup was not removed from bucket -- minio"
 	exit 1

e2e-tests/demand-backup/run

@@ -116,11 +116,11 @@ create_infra $namespace
 
 deploy_minio
 
-desc 'create secrets and start client'
 cluster="some-name-rs0"
-kubectl_bin apply \
-	-f "$conf_dir/secrets.yml" \
-	-f "$conf_dir/client.yml"
+
+desc 'create secrets and start client'
+kubectl_bin apply -f $conf_dir/secrets.yml
+apply_client $conf_dir/client.yml
 
 apply_s3_storage_secrets
 
@@ -215,10 +215,7 @@ fi
 
 desc 'check backup and restore -- minio'
 backup_dest_minio=$(get_backup_dest "$backup_name_minio")
-kubectl_bin run -i --rm aws-cli --image=perconalab/awscli --restart=Never -- \
-	/usr/bin/env AWS_ACCESS_KEY_ID=some-access-key AWS_SECRET_ACCESS_KEY=some-secret-key AWS_DEFAULT_REGION=us-east-1 \
-	/usr/bin/aws --endpoint-url http://minio-service:9000 s3 ls s3://${backup_dest_minio}/rs0/ \
-	| grep myApp.test.gz
+aws_cli "s3 ls s3://${backup_dest_minio}/rs0/" | grep "myApp.test.gz"
 run_recovery_check "$backup_name_minio" "$cluster"
 
 run_mongo \
@@ -250,10 +247,7 @@ run_recovery_check_bkp_source "$backup_name_minio" "$backup_dest_minio" "$cluste
 
 desc 'delete backup and check if it is removed from bucket -- minio'
 kubectl_bin delete psmdb-backup --all
-backup_exists=$(kubectl_bin run -i --rm aws-cli --image=perconalab/awscli --restart=Never -- \
-	/usr/bin/env AWS_ACCESS_KEY_ID=some-access-key AWS_SECRET_ACCESS_KEY=some-secret-key AWS_DEFAULT_REGION=us-east-1 \
-	/usr/bin/aws --endpoint-url http://minio-service:9000 s3 ls s3://operator-testing/ \
-	| grep -c ${backup_dest_minio} | cat)
+backup_exists=$(aws_cli "s3 ls s3://operator-testing/" | grep -c ${backup_dest_minio} | cat)
 if [[ $backup_exists -eq 1 ]]; then
 	echo "Backup was not removed from bucket -- minio"
 	exit 1
@@ -285,10 +279,7 @@ sleep 60
 
 desc 'delete backup and check if it is removed from bucket -- minio'
 kubectl_bin delete psmdb-backup --all
-backup_exists=$(kubectl_bin run -i --rm aws-cli --image=perconalab/awscli --restart=Never -- \
-	/usr/bin/env AWS_ACCESS_KEY_ID=some-access-key AWS_SECRET_ACCESS_KEY=some-secret-key AWS_DEFAULT_REGION=us-east-1 \
-	/usr/bin/aws --endpoint-url http://minio-service:9000 s3 ls s3://operator-testing/ \
-	| grep -c ${backup_dest_minio} | cat)
+backup_exists=$(aws_cli "s3 ls s3://operator-testing/" | grep -c ${backup_dest_minio} | cat)
 if [[ $backup_exists -eq 1 ]]; then
 	echo "Backup was not removed from bucket -- minio"
 	exit 1

e2e-tests/expose-sharded/run

@@ -91,12 +91,10 @@ function expose_cluster() {
 function main() {
 
 	create_infra "$namespace"
-	desc 'create first PSMDB cluster'
-	cluster="some-name"
 
-	kubectl_bin apply \
-		-f "$conf_dir/secrets.yml" \
-		-f "$conf_dir/client.yml"
+	desc 'create secrets and start client'
+	kubectl_bin apply -f $conf_dir/secrets.yml
+	apply_client $conf_dir/client.yml
 
 	apply_s3_storage_secrets
 	if version_gt "1.19" && [ $EKS -ne 1 ]; then
@@ -107,6 +105,8 @@ function main() {
 		kubectl_bin apply -f "$conf_dir/container-rc.yaml"
 	fi
 
+	desc 'create first PSMDB cluster'
+	cluster="some-name"
 	apply_cluster "$test_dir/conf/$cluster-rs0.yml"
 	desc 'check if all 3 Pods started'
 	wait_for_running $cluster-rs0 3

e2e-tests/finalizer/run

@@ -7,13 +7,12 @@ test_dir=$(realpath "$(dirname "$0")")
 . "${test_dir}/../functions"
 
 create_infra "$namespace"
-cluster="some-name"
 
 desc 'create secrets and start client'
-kubectl_bin apply \
-	-f $conf_dir/secrets_with_tls.yml \
-	-f $conf_dir/client.yml
+kubectl_bin apply -f $conf_dir/secrets_with_tls.yml
+apply_client $conf_dir/client.yml
 
+cluster="some-name"
 apply_cluster "$test_dir/conf/$cluster.yml"
 desc 'check if all 3 Pods started'
 wait_for_running "$cluster-rs0" 3