Merge branch 'main' into feat/add-extra-pvcs

Author: hors

build/backup/lib/pxc/aws.sh

@@ -3,8 +3,8 @@
 set -o errexit
 
 export AWS_SHARED_CREDENTIALS_FILE='/tmp/aws-credfile'
-export AWS_ENDPOINT_URL="${ENDPOINT:-https://s3.amazonaws.com}"
 export AWS_REGION="${DEFAULT_REGION:-us-west-2}"
+export AWS_ENDPOINT_URL="${ENDPOINT:-https://s3.${AWS_REGION}.amazonaws.com}"
 
 if [ -n "$VERIFY_TLS" ] && [[ $VERIFY_TLS == "false" ]]; then
 	AWS_S3_NO_VERIFY_SSL='--no-verify-ssl'

e2e-tests/functions

@@ -305,15 +305,15 @@ deploy_operator() {
 			| sed -e "s^image: .*^image: ${IMAGE}^" \
 			| sed -e "s^failureThreshold: .*^failureThreshold: 10^" \
 			| yq eval '(select(.kind == "Deployment").spec.template.spec.containers[] | select(.name == "percona-xtradb-cluster-operator").env[] | select(.name == "DISABLE_TELEMETRY").value) = "true"' - \
-			| yq eval '(select(.kind == "Deployment").spec.template.spec.containers[] | select(.name == "percona-xtradb-cluster-operator").env[] | select(.name == "LOG_LEVEL").value) = "DEBUG"' - \
+			| yq eval '(select(.kind == "Deployment").spec.template.spec.containers[] | select(.name == "percona-xtradb-cluster-operator").env[] | select(.name == "LOG_LEVEL").value) = "VERBOSE"' - \
 			| kubectl_bin apply -f -
 	else
 		apply_rbac rbac
 		cat ${src_dir}/deploy/operator.yaml \
 			| sed -e "s^image: .*^image: ${IMAGE}^" \
 			| sed -e "s^failureThreshold: .*^failureThreshold: 10^" \
 			| yq eval '(select(.kind == "Deployment").spec.template.spec.containers[] | select(.name == "percona-xtradb-cluster-operator").env[] | select(.name == "DISABLE_TELEMETRY").value) = "true"' - \
-			| yq eval '(select(.kind == "Deployment").spec.template.spec.containers[] | select(.name == "percona-xtradb-cluster-operator").env[] | select(.name == "LOG_LEVEL").value) = "DEBUG"' - \
+			| yq eval '(select(.kind == "Deployment").spec.template.spec.containers[] | select(.name == "percona-xtradb-cluster-operator").env[] | select(.name == "LOG_LEVEL").value) = "VERBOSE"' - \
 			| kubectl_bin apply -f -
 	fi
 

e2e-tests/haproxy/run

@@ -68,8 +68,9 @@ main() {
 	wait_cluster_consistency "$cluster" 3 3
 	check_haproxy_writer
 
-	desc 'check for passwords leak'
-	check_passwords_leak
+	# Temporarily skipping this check
+	#desc 'check for passwords leak'
+	#check_passwords_leak
 
 	desc 'delete active writer and checking all haproxy pods still point to the same writer'
 	desc 'fail pxc-pod-0 pod for 60s'

e2e-tests/init-deploy/run

@@ -112,8 +112,9 @@ compare_mysql_cmd "select-1" "SELECT * from myApp.myApp;" "-h $cluster3-pxc-1.$c
 compare_mysql_cmd "select-1" "SELECT * from myApp.myApp;" "-h $cluster3-pxc-2.$cluster3-pxc -uroot -proot_password"
 compare_mysql_cmd "max_allowed_packet-2" "SELECT @@max_allowed_packet;" "-h $cluster3-pxc-0.$cluster3-pxc -uroot -proot_password"
 
-desc 'check for passwords leak'
-check_passwords_leak
+# Temporarily skipping this check
+#desc 'check for passwords leak'
+#check_passwords_leak
 
 kubectl_bin delete -f $test_dir/conf/$cluster3.yml
 destroy $namespace

e2e-tests/monitoring-2-0/run

@@ -150,8 +150,9 @@ if [[ -n ${OPENSHIFT} ]]; then
 	fi
 fi
 
-desc 'check for passwords leak'
-check_passwords_leak
+# Temporarily skipping this check
+# desc 'check for passwords leak'
+# check_passwords_leak
 
 helm uninstall monitoring
 destroy $namespace

e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-haproxy-k127.yml

@@ -77,7 +77,7 @@ spec:
             - name: PMM_AGENT_SIDECAR_SLEEP
               value: "5"
             - name: PMM_AGENT_PATHS_TEMPDIR
-              value: /tmp
+              value: /tmp/pmm
             - name: PMM_AGENT_PRERUN_SCRIPT
               value: /var/lib/mysql/pmm-prerun.sh
             - name: DB_CLUSTER
@@ -92,7 +92,7 @@ spec:
             - name: DB_HOST
               value: localhost
             - name: CLUSTER_NAME
-              value: monitoring
+              value: foo-custom-cluster-name
             - name: PMM_AGENT_SETUP_NODE_NAME
               value: $(PMM_PREFIX)$(POD_NAMESPACE)-$(POD_NAME)
             - name: DB_TYPE

e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-haproxy-no-prefix-k127.yml

@@ -77,7 +77,7 @@ spec:
             - name: PMM_AGENT_SIDECAR_SLEEP
               value: "5"
             - name: PMM_AGENT_PATHS_TEMPDIR
-              value: /tmp
+              value: /tmp/pmm
             - name: PMM_AGENT_PRERUN_SCRIPT
               value: /var/lib/mysql/pmm-prerun.sh
             - name: DB_CLUSTER
@@ -92,7 +92,7 @@ spec:
             - name: DB_HOST
               value: localhost
             - name: CLUSTER_NAME
-              value: monitoring
+              value: foo-custom-cluster-name
             - name: PMM_AGENT_SETUP_NODE_NAME
               value: $(POD_NAMESPACE)-$(POD_NAME)
             - name: DB_TYPE

e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-haproxy-no-prefix-oc.yml

@@ -74,7 +74,7 @@ spec:
             - name: PMM_AGENT_SIDECAR_SLEEP
               value: "5"
             - name: PMM_AGENT_PATHS_TEMPDIR
-              value: /tmp
+              value: /tmp/pmm
             - name: PMM_AGENT_PRERUN_SCRIPT
               value: /var/lib/mysql/pmm-prerun.sh
             - name: DB_CLUSTER
@@ -89,7 +89,7 @@ spec:
             - name: DB_HOST
               value: localhost
             - name: CLUSTER_NAME
-              value: monitoring
+              value: foo-custom-cluster-name
             - name: PMM_AGENT_SETUP_NODE_NAME
               value: $(POD_NAMESPACE)-$(POD_NAME)
             - name: DB_TYPE

e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-haproxy-no-prefix.yml

@@ -74,7 +74,7 @@ spec:
             - name: PMM_AGENT_SIDECAR_SLEEP
               value: "5"
             - name: PMM_AGENT_PATHS_TEMPDIR
-              value: /tmp
+              value: /tmp/pmm
             - name: PMM_AGENT_PRERUN_SCRIPT
               value: /var/lib/mysql/pmm-prerun.sh
             - name: DB_CLUSTER
@@ -89,7 +89,7 @@ spec:
             - name: DB_HOST
               value: localhost
             - name: CLUSTER_NAME
-              value: monitoring
+              value: foo-custom-cluster-name
             - name: PMM_AGENT_SETUP_NODE_NAME
               value: $(POD_NAMESPACE)-$(POD_NAME)
             - name: DB_TYPE

e2e-tests/monitoring-pmm3/compare/statefulset_monitoring-haproxy-oc.yml

@@ -74,7 +74,7 @@ spec:
             - name: PMM_AGENT_SIDECAR_SLEEP
               value: "5"
             - name: PMM_AGENT_PATHS_TEMPDIR
-              value: /tmp
+              value: /tmp/pmm
             - name: PMM_AGENT_PRERUN_SCRIPT
               value: /var/lib/mysql/pmm-prerun.sh
             - name: DB_CLUSTER
@@ -89,7 +89,7 @@ spec:
             - name: DB_HOST
               value: localhost
             - name: CLUSTER_NAME
-              value: monitoring
+              value: foo-custom-cluster-name
             - name: PMM_AGENT_SETUP_NODE_NAME
               value: $(PMM_PREFIX)$(POD_NAMESPACE)-$(POD_NAME)
             - name: DB_TYPE