K8SPSMDB-1098 fix tls-issue-cert-manager test (#1627)

* K8SPSMDB-1098 fix tls-issue-cert-manager test * fix liveness test * fix liveness * Update e2e-tests/liveness/run Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
percona · Aug 23, 2024 · c2b95d9 · c2b95d9
1 parent d1bda8d
commit c2b95d9
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/e2e-tests/functions b/e2e-tests/functions
@@ -632,6 +632,7 @@ compare_generation() {
 compare_kubectl() {
 	local resource="$1"
 	local postfix="$2"
+	local skip_generation_check="$3"
 	local expected_result=${test_dir}/compare/${resource//\//_}${postfix}.yml
 	local new_result="${tmp_dir}/${resource//\//_}.yml"
 
@@ -693,6 +694,9 @@ compare_kubectl() {
 			yq -i eval 'del(.metadata.generation)' ${new_result}
 		fi
 	fi
+	if [ -n "$skip_generation_check" ]; then
+		yq -i eval 'del(.metadata.generation)' ${new_result}
+	fi
 	diff -u "$expected_result" "$new_result"
 }
 

diff --git a/e2e-tests/liveness/run b/e2e-tests/liveness/run
@@ -18,9 +18,11 @@ spinup_psmdb ${cluster}-rs0 $test_dir/conf/${cluster}-rs0.yml
 desc 'check if statefulset created with expected config'
 compare_kubectl "statefulset/${cluster}-rs0"
 
-# There should be some failed liveness checks during the password change.
-desc 'change MONGODB_CLUSTER_MONITOR_PASSWORD'
-patch_secret "some-users" "MONGODB_CLUSTER_MONITOR_PASSWORD" "$newpassencrypted"
+# There should be some failed liveness checks due to wrong optoins in command
+set +e
+kubectl exec -it $cluster-rs0-0 -- bash -c '/opt/percona/mongodb-healthcheck k8s liveness --ssl'
+set -e
+
 sleep 20
 wait_for_running "${cluster}-rs0" "3"
 
@@ -33,7 +35,7 @@ if [[ $current_log_file != "1" ]]; then
 fi
 
 rotated_log_files=$(kubectl_bin exec -it $cluster-rs0-0 -- bash -c 'ls /data/db/mongod-data/logs' | grep -c "mongodb-healthcheck-.*\.log\.gz")
-if [[ $rotated_log_files != "1" ]]; then
+if [[ $rotated_log_files -lt "1" ]]; then
 	echo "mongodb-healthcheck.log doesn't exist"
 	exit 1
 fi

diff --git a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-tls-disabled-oc.yml b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-tls-disabled-oc.yml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 7
   labels:
     app.kubernetes.io/component: cfg
     app.kubernetes.io/instance: some-name

diff --git a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-tls-disabled.yml b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-tls-disabled.yml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 7
   labels:
     app.kubernetes.io/component: cfg
     app.kubernetes.io/instance: some-name

diff --git a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-mongos-tls-disabled-oc.yml b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-mongos-tls-disabled-oc.yml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 7
   labels:
     app.kubernetes.io/component: mongos
     app.kubernetes.io/instance: some-name

diff --git a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-mongos-tls-disabled.yml b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-mongos-tls-disabled.yml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 7
   labels:
     app.kubernetes.io/component: mongos
     app.kubernetes.io/instance: some-name

diff --git a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-tls-disabled-oc.yml b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-tls-disabled-oc.yml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 8
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name

diff --git a/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-tls-disabled.yml b/e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-tls-disabled.yml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 8
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name

diff --git a/e2e-tests/tls-issue-cert-manager/run b/e2e-tests/tls-issue-cert-manager/run
@@ -138,9 +138,9 @@ main() {
 	unpause_cluster "$cluster"
 	wait_for_cluster_state "${cluster}" "ready"
 
-	compare_kubectl statefulset/${cluster}-rs0 "-tls-disabled"
-	compare_kubectl statefulset/${cluster}-cfg "-tls-disabled"
-	compare_kubectl statefulset/${cluster}-mongos "-tls-disabled"
+	compare_kubectl statefulset/${cluster}-rs0 "-tls-disabled" "skip_generation_check"
+	compare_kubectl statefulset/${cluster}-cfg "-tls-disabled" "skip_generation_check"
+	compare_kubectl statefulset/${cluster}-mongos "-tls-disabled" "skip_generation_check"
 
 	destroy "$namespace"
 	desc 'test passed'