Merge branch 'main' into k8spg-372-cluster-wide-issue

percona · Oct 12, 2023 · b759e29 · b759e29
2 parents 874fbe7 + c47011f
commit b759e29
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/e2e-tests/functions b/e2e-tests/functions
@@ -422,13 +422,22 @@ get_pod_by_role() {
 }
 
 check_passwords_leak() {
+	local secrets
+	local passwords
+	local pods
 
-	secrets=$(kubectl -n "${NAMESPACE}" get secrets -o json | jq -r '.items[] | select(.data."password"? != null) | .data."password"' ; kubectl -n "${NAMESPACE}" get secrets -o json | jq -r '.items[] | select(.data."pgbouncer-password"? != null) | .data."pgbouncer-password"')
+	secrets=$(
+		kubectl -n "${NAMESPACE}" get secrets -o json | jq -r '.items[] | select(.data."password"? != null) | .data."password"'
+		kubectl -n "${NAMESPACE}" get secrets -o json | jq -r '.items[] | select(.data."pgbouncer-password"? != null) | .data."pgbouncer-password"'
+	)
 
 	passwords="$(for i in $secrets; do base64 -d <<< $i; echo; done) $secrets"
 	pods=$(kubectl -n "${NAMESPACE}" get pods -o name | awk -F "/" '{print $2}')
 
 	collect_logs() {
+		local containers
+		local count
+
 		NS=$1
 		for p in $pods; do
 			containers=$(kubectl -n "$NS" get pod $p -o jsonpath='{.spec.containers[*].name}')