diff --git a/e2e-tests/tests/builtin-extensions/00-deploy-operator.yaml b/e2e-tests/tests/builtin-extensions/00-deploy-operator.yaml index 96329aabb8..5db1de9747 100644 --- a/e2e-tests/tests/builtin-extensions/00-deploy-operator.yaml +++ b/e2e-tests/tests/builtin-extensions/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -13,3 +12,4 @@ commands: deploy_client deploy_s3_secrets deploy_minio + timeout: 10 diff --git a/e2e-tests/tests/builtin-extensions/01-create-cluster.yaml b/e2e-tests/tests/builtin-extensions/01-create-cluster.yaml index abe1d5a61a..3d84380333 100644 --- a/e2e-tests/tests/builtin-extensions/01-create-cluster.yaml +++ b/e2e-tests/tests/builtin-extensions/01-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -9,3 +8,4 @@ commands: source ../../functions get_cr | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/builtin-extensions/02-check-extensions.yaml b/e2e-tests/tests/builtin-extensions/02-check-extensions.yaml index 1f29c2b415..7e90fa9209 100644 --- a/e2e-tests/tests/builtin-extensions/02-check-extensions.yaml +++ b/e2e-tests/tests/builtin-extensions/02-check-extensions.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(kubectl -n ${NAMESPACE} exec $(get_client_pod) -- psql -v ON_ERROR_STOP=1 -t -q postgres://postgres:$(get_psql_user_pass builtin-extensions-pguser-postgres)@$(get_psql_user_host builtin-extensions-pguser-postgres) -c "\c postgres" -c "SELECT extname FROM pg_extension ORDER BY extname") kubectl create configmap -n "${NAMESPACE}" 02-check-extensions --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/builtin-extensions/04-check-extensions.yaml b/e2e-tests/tests/builtin-extensions/04-check-extensions.yaml index c5b0581a9d..59fa759eb6 100644 --- a/e2e-tests/tests/builtin-extensions/04-check-extensions.yaml +++ b/e2e-tests/tests/builtin-extensions/04-check-extensions.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(kubectl -n ${NAMESPACE} exec $(get_client_pod) -- psql -v ON_ERROR_STOP=1 -t -q postgres://postgres:$(get_psql_user_pass builtin-extensions-pguser-postgres)@$(get_psql_user_host builtin-extensions-pguser-postgres) -c "\c postgres" -c "SELECT extname FROM pg_extension ORDER BY extname") kubectl create configmap -n "${NAMESPACE}" 04-check-extensions --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/builtin-extensions/07-check-extensions.yaml b/e2e-tests/tests/builtin-extensions/07-check-extensions.yaml index 2b918afa27..82c02ffd80 100644 --- a/e2e-tests/tests/builtin-extensions/07-check-extensions.yaml +++ b/e2e-tests/tests/builtin-extensions/07-check-extensions.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(kubectl -n ${NAMESPACE} exec $(get_client_pod) -- psql -v ON_ERROR_STOP=1 -t -q postgres://postgres:$(get_psql_user_pass builtin-extensions-pguser-postgres)@$(get_psql_user_host builtin-extensions-pguser-postgres) -c "\c postgres" -c "SELECT extname FROM pg_extension ORDER BY extname") kubectl create configmap -n "${NAMESPACE}" 06-check-extensions --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/cert-manager-tls/00-deploy-operator.yaml b/e2e-tests/tests/cert-manager-tls/00-deploy-operator.yaml index ae60eecb05..8755494484 100644 --- a/e2e-tests/tests/cert-manager-tls/00-deploy-operator.yaml +++ b/e2e-tests/tests/cert-manager-tls/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -11,4 +10,5 @@ commands: deploy_cert_manager deploy_operator - deploy_client \ No newline at end of file + deploy_client + timeout: 10 diff --git a/e2e-tests/tests/cert-manager-tls/01-create-cluster.yaml b/e2e-tests/tests/cert-manager-tls/01-create-cluster.yaml index eb0ab4d3c2..bd9d303ecc 100644 --- a/e2e-tests/tests/cert-manager-tls/01-create-cluster.yaml +++ b/e2e-tests/tests/cert-manager-tls/01-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -9,4 +8,5 @@ commands: source ../../functions get_cr "cert-manager-tls" \ - | kubectl -n "${NAMESPACE}" apply -f - \ No newline at end of file + | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/cert-manager-tls/02-verify-cert-manager-resources.yaml b/e2e-tests/tests/cert-manager-tls/02-verify-cert-manager-resources.yaml index f8911c9fe7..53699ada57 100644 --- a/e2e-tests/tests/cert-manager-tls/02-verify-cert-manager-resources.yaml +++ b/e2e-tests/tests/cert-manager-tls/02-verify-cert-manager-resources.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 60 commands: - script: |- set -o errexit @@ -60,3 +59,4 @@ commands: fi echo "Instance certificate $cert_name is ready" done + timeout: 60 diff --git a/e2e-tests/tests/cert-manager-tls/03-verify-tls-secrets.yaml b/e2e-tests/tests/cert-manager-tls/03-verify-tls-secrets.yaml index d1d67003c6..68762bb765 100644 --- a/e2e-tests/tests/cert-manager-tls/03-verify-tls-secrets.yaml +++ b/e2e-tests/tests/cert-manager-tls/03-verify-tls-secrets.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 120 commands: - script: |- set -o errexit @@ -123,3 +122,4 @@ commands: verify_secret_data "$secret_name" tls.crt tls.key dns.crt dns.key patroni.ca-roots patroni.crt-combined pgbackrest-server.crt pgbackrest-server.key echo "Instance secret $secret_name is valid" done + timeout: 120 diff --git a/e2e-tests/tests/cert-manager-tls/05-read-from-primary.yaml b/e2e-tests/tests/cert-manager-tls/05-read-from-primary.yaml index 2b8166ba5d..95adbdd948 100644 --- a/e2e-tests/tests/cert-manager-tls/05-read-from-primary.yaml +++ b/e2e-tests/tests/cert-manager-tls/05-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -10,4 +9,5 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass cert-manager-tls-pguser-postgres)@$(get_psql_user_host cert-manager-tls-pguser-postgres)") - kubectl create configmap -n "${NAMESPACE}" 05-read-from-primary --from-literal=data="${data}" \ No newline at end of file + kubectl create configmap -n "${NAMESPACE}" 05-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/cert-manager-tls/06-verify-tls-connection.yaml b/e2e-tests/tests/cert-manager-tls/06-verify-tls-connection.yaml index 3babb02057..fd2a1fa836 100644 --- a/e2e-tests/tests/cert-manager-tls/06-verify-tls-connection.yaml +++ b/e2e-tests/tests/cert-manager-tls/06-verify-tls-connection.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -32,4 +31,5 @@ commands: exit 1 fi - kubectl create configmap -n "${NAMESPACE}" 06-verify-tls-connection --from-literal=status="verified" \ No newline at end of file + kubectl create configmap -n "${NAMESPACE}" 06-verify-tls-connection --from-literal=status="verified" + timeout: 30 diff --git a/e2e-tests/tests/cert-manager-tls/07-verify-tls-pgbouncer.yaml b/e2e-tests/tests/cert-manager-tls/07-verify-tls-pgbouncer.yaml index b12df05cbd..7a2fa480b0 100644 --- a/e2e-tests/tests/cert-manager-tls/07-verify-tls-pgbouncer.yaml +++ b/e2e-tests/tests/cert-manager-tls/07-verify-tls-pgbouncer.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -29,3 +28,4 @@ commands: echo "PgBouncer-to-PostgreSQL connection is not using SSL" exit 1 fi + timeout: 30 diff --git a/e2e-tests/tests/cert-manager-tls/08-verify-tls-replication.yaml b/e2e-tests/tests/cert-manager-tls/08-verify-tls-replication.yaml index 7b0eb6fa6f..25d293ec7d 100644 --- a/e2e-tests/tests/cert-manager-tls/08-verify-tls-replication.yaml +++ b/e2e-tests/tests/cert-manager-tls/08-verify-tls-replication.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -17,3 +16,4 @@ commands: echo "No SSL replication connections found, got: $repl_ssl_count" exit 1 fi + timeout: 30 diff --git a/e2e-tests/tests/cert-manager-tls/09-verify-tls-pgbackrest.yaml b/e2e-tests/tests/cert-manager-tls/09-verify-tls-pgbackrest.yaml index c8afa2304d..43db32b66a 100644 --- a/e2e-tests/tests/cert-manager-tls/09-verify-tls-pgbackrest.yaml +++ b/e2e-tests/tests/cert-manager-tls/09-verify-tls-pgbackrest.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -34,3 +33,4 @@ commands: # Verify pgBackRest works over TLS, not just cert file existence kubectl -n "$NAMESPACE" exec "$instance" -c pgbackrest -- pgbackrest info + timeout: 30 diff --git a/e2e-tests/tests/cert-manager-tls/10-cert-deletion-recovery.yaml b/e2e-tests/tests/cert-manager-tls/10-cert-deletion-recovery.yaml index 88bd8602b7..e21d889e42 100644 --- a/e2e-tests/tests/cert-manager-tls/10-cert-deletion-recovery.yaml +++ b/e2e-tests/tests/cert-manager-tls/10-cert-deletion-recovery.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 300 commands: - script: |- set -o errexit @@ -101,3 +100,4 @@ commands: done wait_cluster_consistency cert-manager-tls + timeout: 300 diff --git a/e2e-tests/tests/cert-manager-tls/11-write-data-after-recovery.yaml b/e2e-tests/tests/cert-manager-tls/11-write-data-after-recovery.yaml index d81df23a94..130fe102f7 100644 --- a/e2e-tests/tests/cert-manager-tls/11-write-data-after-recovery.yaml +++ b/e2e-tests/tests/cert-manager-tls/11-write-data-after-recovery.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -15,3 +14,4 @@ commands: run_psql_local \ '\c newapp \\\ INSERT INTO newApp (id) VALUES (200500)' \ "postgres:$(get_psql_user_pass cert-manager-tls-pguser-postgres)@$(get_psql_user_host cert-manager-tls-pguser-postgres)" + timeout: 30 diff --git a/e2e-tests/tests/cert-manager-tls/12-verify-data-after-recovery.yaml b/e2e-tests/tests/cert-manager-tls/12-verify-data-after-recovery.yaml index bfebc746ba..8edd9ac1b7 100644 --- a/e2e-tests/tests/cert-manager-tls/12-verify-data-after-recovery.yaml +++ b/e2e-tests/tests/cert-manager-tls/12-verify-data-after-recovery.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -14,3 +13,4 @@ commands: echo "Missing data in primary" exit 1 fi + timeout: 30 diff --git a/e2e-tests/tests/custom-envs/00-deploy-operator.yaml b/e2e-tests/tests/custom-envs/00-deploy-operator.yaml index 7faf4da852..b64878610d 100644 --- a/e2e-tests/tests/custom-envs/00-deploy-operator.yaml +++ b/e2e-tests/tests/custom-envs/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -12,3 +11,4 @@ commands: deploy_operator deploy_client deploy_s3_secrets + timeout: 10 diff --git a/e2e-tests/tests/custom-envs/01-create-cluster.yaml b/e2e-tests/tests/custom-envs/01-create-cluster.yaml index 2ff465910f..4054690f11 100644 --- a/e2e-tests/tests/custom-envs/01-create-cluster.yaml +++ b/e2e-tests/tests/custom-envs/01-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 20 commands: - script: |- set -o errexit @@ -13,3 +12,4 @@ commands: .spec.proxy.pgBouncer.replicas=1 | .spec.instances[].replicas=1' - \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 20 diff --git a/e2e-tests/tests/custom-envs/02-add-env-to-instance.yaml b/e2e-tests/tests/custom-envs/02-add-env-to-instance.yaml index 0a36be90fe..bdc4bff157 100644 --- a/e2e-tests/tests/custom-envs/02-add-env-to-instance.yaml +++ b/e2e-tests/tests/custom-envs/02-add-env-to-instance.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -12,7 +11,7 @@ commands: .spec.instances[].replicas = 1 | .spec.instances[].env = ((.spec.instances[].env // []) + [{"name": "FIRST_ENV", "value": "1000"}, {"name": "SECOND_ENV", "value": "2000"}] | unique_by(.name)) ' - | kubectl -n "${NAMESPACE}" apply -f - - + timeout: 10 sleep 10 wait_cluster_consistency custom-envs diff --git a/e2e-tests/tests/custom-envs/03-update-env-for-instance.yaml b/e2e-tests/tests/custom-envs/03-update-env-for-instance.yaml index 1afd19810f..14f57429e7 100644 --- a/e2e-tests/tests/custom-envs/03-update-env-for-instance.yaml +++ b/e2e-tests/tests/custom-envs/03-update-env-for-instance.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -16,4 +15,5 @@ commands: sleep 10 wait_cluster_consistency custom-envs - check_envs_for_component add instance FIRST_ENV=2000 SECOND_ENV=2000 \ No newline at end of file + check_envs_for_component add instance FIRST_ENV=2000 SECOND_ENV=2000 + timeout: 10 diff --git a/e2e-tests/tests/custom-envs/04-add-env-secret-to-instance.yaml b/e2e-tests/tests/custom-envs/04-add-env-secret-to-instance.yaml index a5a632a4bd..c69169b707 100644 --- a/e2e-tests/tests/custom-envs/04-add-env-secret-to-instance.yaml +++ b/e2e-tests/tests/custom-envs/04-add-env-secret-to-instance.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 20 commands: - script: |- set -o errexit diff --git a/e2e-tests/tests/custom-envs/05-update-env-in-secret-for-instance.yaml b/e2e-tests/tests/custom-envs/05-update-env-in-secret-for-instance.yaml index 58ebca0fbb..3d82bb7b3e 100644 --- a/e2e-tests/tests/custom-envs/05-update-env-in-secret-for-instance.yaml +++ b/e2e-tests/tests/custom-envs/05-update-env-in-secret-for-instance.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 20 commands: - script: |- set -o errexit @@ -16,4 +15,4 @@ commands: sleep 10 wait_cluster_consistency custom-envs check_envs_for_component add instance DB_USER=myuser DB_PASSWORD=MyS3cretP@ss DB_NEW_ENV=new-value - + timeout: 20 diff --git a/e2e-tests/tests/custom-envs/06-update-secret-for-instance.yaml b/e2e-tests/tests/custom-envs/06-update-secret-for-instance.yaml index 443c98fdce..a5a2a1f9cb 100644 --- a/e2e-tests/tests/custom-envs/06-update-secret-for-instance.yaml +++ b/e2e-tests/tests/custom-envs/06-update-secret-for-instance.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit diff --git a/e2e-tests/tests/custom-envs/07-delete-env-for-instance.yaml b/e2e-tests/tests/custom-envs/07-delete-env-for-instance.yaml index 86a1059b64..d78546f3d7 100644 --- a/e2e-tests/tests/custom-envs/07-delete-env-for-instance.yaml +++ b/e2e-tests/tests/custom-envs/07-delete-env-for-instance.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit diff --git a/e2e-tests/tests/custom-envs/08-delete-secret-for-instance.yaml b/e2e-tests/tests/custom-envs/08-delete-secret-for-instance.yaml index 1fc3c5e31c..1178684b36 100644 --- a/e2e-tests/tests/custom-envs/08-delete-secret-for-instance.yaml +++ b/e2e-tests/tests/custom-envs/08-delete-secret-for-instance.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit diff --git a/e2e-tests/tests/custom-envs/09-add-env-to-pgbouncer.yaml b/e2e-tests/tests/custom-envs/09-add-env-to-pgbouncer.yaml index ce43601811..e8887b77b3 100644 --- a/e2e-tests/tests/custom-envs/09-add-env-to-pgbouncer.yaml +++ b/e2e-tests/tests/custom-envs/09-add-env-to-pgbouncer.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -14,4 +13,5 @@ commands: sleep 10 wait_cluster_consistency custom-envs - check_envs_for_component add pgbouncer FIRST_ENV=1000 SECOND_ENV=2000 \ No newline at end of file + check_envs_for_component add pgbouncer FIRST_ENV=1000 SECOND_ENV=2000 + timeout: 10 diff --git a/e2e-tests/tests/custom-envs/10-update-env-for-pgbouncer.yaml b/e2e-tests/tests/custom-envs/10-update-env-for-pgbouncer.yaml index 73de84401b..c9b4e90f60 100644 --- a/e2e-tests/tests/custom-envs/10-update-env-for-pgbouncer.yaml +++ b/e2e-tests/tests/custom-envs/10-update-env-for-pgbouncer.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -18,4 +17,4 @@ commands: wait_cluster_consistency custom-envs check_envs_for_component add pgbouncer FIRST_ENV=2000 SECOND_ENV=2000 - + timeout: 10 diff --git a/e2e-tests/tests/custom-envs/11-add-env-secret-to-pgbouncer.yaml b/e2e-tests/tests/custom-envs/11-add-env-secret-to-pgbouncer.yaml index fdca41b907..3b950f46e2 100644 --- a/e2e-tests/tests/custom-envs/11-add-env-secret-to-pgbouncer.yaml +++ b/e2e-tests/tests/custom-envs/11-add-env-secret-to-pgbouncer.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 20 commands: - script: |- set -o errexit @@ -21,3 +20,4 @@ commands: sleep 10 wait_cluster_consistency custom-envs check_envs_for_component add pgbouncer DB_USER=myuser DB_PASSWORD=MyS3cretP@ss + timeout: 20 diff --git a/e2e-tests/tests/custom-envs/12-update-env-in-secret-for-pgbouncer.yaml b/e2e-tests/tests/custom-envs/12-update-env-in-secret-for-pgbouncer.yaml index 3348f535e3..16a80c2dfd 100644 --- a/e2e-tests/tests/custom-envs/12-update-env-in-secret-for-pgbouncer.yaml +++ b/e2e-tests/tests/custom-envs/12-update-env-in-secret-for-pgbouncer.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 20 commands: - script: |- set -o errexit @@ -15,4 +14,4 @@ commands: sleep 10 wait_cluster_consistency custom-envs check_envs_for_component add pgbouncer DB_USER=myuser DB_PASSWORD=MyS3cretP@ss DB_NEW_ENV=new-value - + timeout: 20 diff --git a/e2e-tests/tests/custom-envs/13-update-secret-for-pgbouncer.yaml b/e2e-tests/tests/custom-envs/13-update-secret-for-pgbouncer.yaml index d842902cb7..fee3c23516 100644 --- a/e2e-tests/tests/custom-envs/13-update-secret-for-pgbouncer.yaml +++ b/e2e-tests/tests/custom-envs/13-update-secret-for-pgbouncer.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -22,4 +21,4 @@ commands: wait_cluster_consistency custom-envs check_envs_for_component add pgbouncer DB_USER_NEW=myuser2 DB_PASSWORD_NEW=NewS3cretP@ss - + timeout: 30 diff --git a/e2e-tests/tests/custom-envs/14-delete-env-for-pgbouncer.yaml b/e2e-tests/tests/custom-envs/14-delete-env-for-pgbouncer.yaml index 26db738324..7add752ebe 100644 --- a/e2e-tests/tests/custom-envs/14-delete-env-for-pgbouncer.yaml +++ b/e2e-tests/tests/custom-envs/14-delete-env-for-pgbouncer.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -19,4 +18,4 @@ commands: wait_cluster_consistency custom-envs check_envs_for_component delete pgbouncer FIRST_ENV SECOND_ENV - + timeout: 10 diff --git a/e2e-tests/tests/custom-envs/15-delete-secret-for-pgbouncer.yaml b/e2e-tests/tests/custom-envs/15-delete-secret-for-pgbouncer.yaml index dcfccae96e..d6a3c9ee1e 100644 --- a/e2e-tests/tests/custom-envs/15-delete-secret-for-pgbouncer.yaml +++ b/e2e-tests/tests/custom-envs/15-delete-secret-for-pgbouncer.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -17,4 +16,4 @@ commands: wait_cluster_consistency custom-envs check_envs_for_component delete pgbouncer DB_USER_NEW DB_PASSWORD_NEW - + timeout: 30 diff --git a/e2e-tests/tests/custom-envs/16-add-env-to-repohost.yaml b/e2e-tests/tests/custom-envs/16-add-env-to-repohost.yaml index c7d7d894a1..5156584ae2 100644 --- a/e2e-tests/tests/custom-envs/16-add-env-to-repohost.yaml +++ b/e2e-tests/tests/custom-envs/16-add-env-to-repohost.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -15,4 +14,4 @@ commands: sleep 20 wait_cluster_consistency custom-envs check_envs_for_component add repohost FIRST_ENV=1000 SECOND_ENV=2000 - + timeout: 10 diff --git a/e2e-tests/tests/custom-envs/17-update-env-for-repohost.yaml b/e2e-tests/tests/custom-envs/17-update-env-for-repohost.yaml index 7a70e4055e..94f9895290 100644 --- a/e2e-tests/tests/custom-envs/17-update-env-for-repohost.yaml +++ b/e2e-tests/tests/custom-envs/17-update-env-for-repohost.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -17,4 +16,4 @@ commands: wait_cluster_consistency custom-envs check_envs_for_component add repohost FIRST_ENV=2000 SECOND_ENV=2000 - + timeout: 10 diff --git a/e2e-tests/tests/custom-envs/18-add-env-secret-to-repohost.yaml b/e2e-tests/tests/custom-envs/18-add-env-secret-to-repohost.yaml index b30bd27209..6c74b99823 100644 --- a/e2e-tests/tests/custom-envs/18-add-env-secret-to-repohost.yaml +++ b/e2e-tests/tests/custom-envs/18-add-env-secret-to-repohost.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 20 commands: - script: |- set -o errexit @@ -21,3 +20,4 @@ commands: wait_cluster_consistency custom-envs check_envs_for_component add repohost DB_USER=myuser DB_PASSWORD=MyS3cretP@ss + timeout: 20 diff --git a/e2e-tests/tests/custom-envs/19-update-env-in-secret-for-repohost.yaml b/e2e-tests/tests/custom-envs/19-update-env-in-secret-for-repohost.yaml index 3479113c28..a0e0a2c6da 100644 --- a/e2e-tests/tests/custom-envs/19-update-env-in-secret-for-repohost.yaml +++ b/e2e-tests/tests/custom-envs/19-update-env-in-secret-for-repohost.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 20 commands: - script: |- set -o errexit @@ -17,4 +16,4 @@ commands: wait_cluster_consistency custom-envs check_envs_for_component add repohost DB_USER=myuser DB_PASSWORD=MyS3cretP@ss DB_NEW_ENV=new-value - + timeout: 20 diff --git a/e2e-tests/tests/custom-envs/20-update-secret-for-repohost.yaml b/e2e-tests/tests/custom-envs/20-update-secret-for-repohost.yaml index bcea8259b7..cf039e48b7 100644 --- a/e2e-tests/tests/custom-envs/20-update-secret-for-repohost.yaml +++ b/e2e-tests/tests/custom-envs/20-update-secret-for-repohost.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -23,5 +22,4 @@ commands: wait_cluster_consistency custom-envs check_envs_for_component add repohost DB_USER_NEW=myuser2 DB_PASSWORD_NEW=NewS3cretP@ss - - + timeout: 30 diff --git a/e2e-tests/tests/custom-envs/21-delete-env-for-repohost.yaml b/e2e-tests/tests/custom-envs/21-delete-env-for-repohost.yaml index 35d2206295..ba7dbe739b 100644 --- a/e2e-tests/tests/custom-envs/21-delete-env-for-repohost.yaml +++ b/e2e-tests/tests/custom-envs/21-delete-env-for-repohost.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -18,4 +17,4 @@ commands: wait_cluster_consistency custom-envs check_envs_for_component delete repohost FIRST_ENV SECOND_ENV - + timeout: 10 diff --git a/e2e-tests/tests/custom-envs/22-delete-secret-for-repohost.yaml b/e2e-tests/tests/custom-envs/22-delete-secret-for-repohost.yaml index 6cd7535b5e..3d084b94c6 100644 --- a/e2e-tests/tests/custom-envs/22-delete-secret-for-repohost.yaml +++ b/e2e-tests/tests/custom-envs/22-delete-secret-for-repohost.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -16,4 +15,5 @@ commands: sleep 60 wait_cluster_consistency custom-envs - check_envs_for_component delete repohost DB_USER_NEW DB_PASSWORD_NEW \ No newline at end of file + check_envs_for_component delete repohost DB_USER_NEW DB_PASSWORD_NEW + timeout: 30 diff --git a/e2e-tests/tests/custom-extensions/00-deploy-operator.yaml b/e2e-tests/tests/custom-extensions/00-deploy-operator.yaml index 0cfe9bbd0e..68645ea7fb 100644 --- a/e2e-tests/tests/custom-extensions/00-deploy-operator.yaml +++ b/e2e-tests/tests/custom-extensions/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -14,3 +13,4 @@ commands: deploy_s3_secrets deploy_minio copy_custom_extensions_form_aws + timeout: 10 diff --git a/e2e-tests/tests/custom-extensions/01-create-cluster.yaml b/e2e-tests/tests/custom-extensions/01-create-cluster.yaml index abe1d5a61a..3d84380333 100644 --- a/e2e-tests/tests/custom-extensions/01-create-cluster.yaml +++ b/e2e-tests/tests/custom-extensions/01-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -9,3 +8,4 @@ commands: source ../../functions get_cr | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/custom-extensions/04-check-extensions.yaml b/e2e-tests/tests/custom-extensions/04-check-extensions.yaml index 0c6a316913..bf801bb91a 100644 --- a/e2e-tests/tests/custom-extensions/04-check-extensions.yaml +++ b/e2e-tests/tests/custom-extensions/04-check-extensions.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(kubectl -n ${NAMESPACE} exec $(get_client_pod) -- psql -v ON_ERROR_STOP=1 -t -q postgres://postgres:$(get_psql_user_pass custom-extensions-pguser-postgres)@$(get_psql_user_host custom-extensions-pguser-postgres) -c "\c postgres" -c "select name from pg_available_extensions where name in ('pg_cron','pg_stat_monitor','pgaudit') order by name") kubectl create configmap -n "${NAMESPACE}" 04-check-extensions --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/custom-extensions/08-check-extensions.yaml b/e2e-tests/tests/custom-extensions/08-check-extensions.yaml index dbfbafdf5e..2f00458ca5 100644 --- a/e2e-tests/tests/custom-extensions/08-check-extensions.yaml +++ b/e2e-tests/tests/custom-extensions/08-check-extensions.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(kubectl -n ${NAMESPACE} exec $(get_client_pod) -- psql -v ON_ERROR_STOP=1 -t -q postgres://postgres:$(get_psql_user_pass custom-extensions-pguser-postgres)@$(get_psql_user_host custom-extensions-pguser-postgres) -c "\c postgres" -c "select name from pg_available_extensions where name in ('pg_cron','pg_stat_monitor','pgaudit') order by name") kubectl create configmap -n "${NAMESPACE}" 10-check-extensions --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/custom-extensions/09-check-installed-extensions.yaml b/e2e-tests/tests/custom-extensions/09-check-installed-extensions.yaml index fa5607a324..b2aeb62267 100644 --- a/e2e-tests/tests/custom-extensions/09-check-installed-extensions.yaml +++ b/e2e-tests/tests/custom-extensions/09-check-installed-extensions.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(kubectl -n ${NAMESPACE} exec $(get_client_pod) -- psql -v ON_ERROR_STOP=1 -t -q postgres://postgres:$(get_psql_user_pass custom-extensions-pguser-postgres)@$(get_psql_user_host custom-extensions-pguser-postgres) -c "\c postgres" -c "select extname from pg_extension order by extname") kubectl create configmap -n "${NAMESPACE}" 11-check-extensions --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/custom-extensions/10-use-aws-storage.yaml b/e2e-tests/tests/custom-extensions/10-use-aws-storage.yaml index f350f7c6c1..4f2023412b 100644 --- a/e2e-tests/tests/custom-extensions/10-use-aws-storage.yaml +++ b/e2e-tests/tests/custom-extensions/10-use-aws-storage.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -18,3 +17,4 @@ commands: {"op": "replace", "path": "/spec/extensions/storage/bucket", "value": "pg-extensions"}, {"op": "replace", "path": "/spec/extensions/storage/endpoint", "value": "s3.eu-central-1.amazonaws.com"} ]' + timeout: 10 diff --git a/e2e-tests/tests/custom-extensions/13-check-extensions.yaml b/e2e-tests/tests/custom-extensions/13-check-extensions.yaml index c187cfd854..c00e3a0d31 100644 --- a/e2e-tests/tests/custom-extensions/13-check-extensions.yaml +++ b/e2e-tests/tests/custom-extensions/13-check-extensions.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(kubectl -n ${NAMESPACE} exec $(get_client_pod) -- psql -v ON_ERROR_STOP=1 -t -q postgres://postgres:$(get_psql_user_pass custom-extensions-pguser-postgres)@$(get_psql_user_host custom-extensions-pguser-postgres) -c "\c postgres" -c "select name from pg_available_extensions where name in ('pg_cron','pg_stat_monitor','pgaudit') order by name") kubectl create configmap -n "${NAMESPACE}" 13-check-extensions --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/custom-extensions/16-check-extensions.yaml b/e2e-tests/tests/custom-extensions/16-check-extensions.yaml index e5c7177941..bed4c3e038 100644 --- a/e2e-tests/tests/custom-extensions/16-check-extensions.yaml +++ b/e2e-tests/tests/custom-extensions/16-check-extensions.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(kubectl -n ${NAMESPACE} exec $(get_client_pod) -- psql -v ON_ERROR_STOP=1 -t -q postgres://postgres:$(get_psql_user_pass custom-extensions-pguser-postgres)@$(get_psql_user_host custom-extensions-pguser-postgres) -c "\c postgres" -c "select name from pg_available_extensions where name in ('pg_cron','pg_stat_monitor','pgaudit') order by name") kubectl create configmap -n "${NAMESPACE}" 16-check-extensions --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/custom-tls/00-deploy-operator.yaml b/e2e-tests/tests/custom-tls/00-deploy-operator.yaml index d8cc92d90c..697fd4170c 100644 --- a/e2e-tests/tests/custom-tls/00-deploy-operator.yaml +++ b/e2e-tests/tests/custom-tls/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -12,3 +11,4 @@ commands: deploy_operator deploy_client deploy_cert_manager + timeout: 10 diff --git a/e2e-tests/tests/custom-tls/02-create-certs.yaml b/e2e-tests/tests/custom-tls/02-create-certs.yaml index 8563ff0597..1960c958f4 100644 --- a/e2e-tests/tests/custom-tls/02-create-certs.yaml +++ b/e2e-tests/tests/custom-tls/02-create-certs.yaml @@ -8,7 +8,6 @@ spec: --- apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -63,4 +62,4 @@ commands: - "digital signature" - "key encipherment" EOF - + timeout: 10 diff --git a/e2e-tests/tests/custom-tls/03-create-cluster.yaml b/e2e-tests/tests/custom-tls/03-create-cluster.yaml index cc66b889c7..ddd511f724 100644 --- a/e2e-tests/tests/custom-tls/03-create-cluster.yaml +++ b/e2e-tests/tests/custom-tls/03-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -17,4 +16,4 @@ commands: | yq '.spec.secrets.customTLSSecret.name="custom-cert-tls-issue-ssl"' \ | yq '.spec.secrets.customReplicationTLSSecret.name="custom-cert-tls-issue-ssl-replica"' \ | kubectl -n "${NAMESPACE}" apply -f - - + timeout: 10 diff --git a/e2e-tests/tests/custom-tls/05-read-from-primary.yaml b/e2e-tests/tests/custom-tls/05-read-from-primary.yaml index 99d4e6fc29..cd02a5e767 100644 --- a/e2e-tests/tests/custom-tls/05-read-from-primary.yaml +++ b/e2e-tests/tests/custom-tls/05-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass custom-tls-pguser-postgres)@$(get_psql_user_host custom-tls-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 03-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/custom-tls/06-verify-tls-pgbouncer.yaml b/e2e-tests/tests/custom-tls/06-verify-tls-pgbouncer.yaml index d828b1efc7..c6f8a7d1ec 100644 --- a/e2e-tests/tests/custom-tls/06-verify-tls-pgbouncer.yaml +++ b/e2e-tests/tests/custom-tls/06-verify-tls-pgbouncer.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -21,3 +20,4 @@ commands: echo "PgBouncer-to-PostgreSQL connection is not using SSL" exit 1 fi + timeout: 30 diff --git a/e2e-tests/tests/custom-tls/07-verify-tls-replication.yaml b/e2e-tests/tests/custom-tls/07-verify-tls-replication.yaml index 2681614b46..f4b6fbbaa2 100644 --- a/e2e-tests/tests/custom-tls/07-verify-tls-replication.yaml +++ b/e2e-tests/tests/custom-tls/07-verify-tls-replication.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -17,3 +16,4 @@ commands: echo "No SSL replication connections found, got: $repl_ssl_count" exit 1 fi + timeout: 30 diff --git a/e2e-tests/tests/custom-tls/08-verify-tls-pgbackrest.yaml b/e2e-tests/tests/custom-tls/08-verify-tls-pgbackrest.yaml index 0ecc18c4b5..249d83c57d 100644 --- a/e2e-tests/tests/custom-tls/08-verify-tls-pgbackrest.yaml +++ b/e2e-tests/tests/custom-tls/08-verify-tls-pgbackrest.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -28,4 +27,4 @@ commands: # Verify pgBackRest works over TLS, not just cert file existence kubectl -n "$NAMESPACE" exec "$instance" -c pgbackrest -- pgbackrest info - + timeout: 30 diff --git a/e2e-tests/tests/custom-tls/11-pause-cluster.yaml b/e2e-tests/tests/custom-tls/11-pause-cluster.yaml index b8a6dfcb03..d5707da80a 100644 --- a/e2e-tests/tests/custom-tls/11-pause-cluster.yaml +++ b/e2e-tests/tests/custom-tls/11-pause-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 250 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: get_cr "custom-tls" ${RANDOM} \ | yq '.spec.pause=true' \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 250 diff --git a/e2e-tests/tests/custom-tls/12-upgrade-cluster.yaml b/e2e-tests/tests/custom-tls/12-upgrade-cluster.yaml index a0147440fd..1ed7f90026 100644 --- a/e2e-tests/tests/custom-tls/12-upgrade-cluster.yaml +++ b/e2e-tests/tests/custom-tls/12-upgrade-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -18,3 +17,4 @@ commands: | yq '.spec.secrets.customTLSSecret.name="new-custom-cert-tls-ssl"' \ | yq '.spec.secrets.customReplicationTLSSecret.name="new-custom-cert-tls-ssl-replica"' \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/custom-tls/13-verify-new-certs.yaml b/e2e-tests/tests/custom-tls/13-verify-new-certs.yaml index fca1041081..6a319544c7 100644 --- a/e2e-tests/tests/custom-tls/13-verify-new-certs.yaml +++ b/e2e-tests/tests/custom-tls/13-verify-new-certs.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -14,3 +13,4 @@ commands: echo "Postgres not configured with the new certificate" exit 1 fi + timeout: 30 diff --git a/e2e-tests/tests/custom-tls/14-verify-tls-pgbouncer.yaml b/e2e-tests/tests/custom-tls/14-verify-tls-pgbouncer.yaml index 35d007b014..03f6a7eb2c 100644 --- a/e2e-tests/tests/custom-tls/14-verify-tls-pgbouncer.yaml +++ b/e2e-tests/tests/custom-tls/14-verify-tls-pgbouncer.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -21,3 +20,4 @@ commands: echo "PgBouncer-to-PostgreSQL connection is not using SSL after rotation" exit 1 fi + timeout: 30 diff --git a/e2e-tests/tests/custom-tls/15-verify-tls-replication.yaml b/e2e-tests/tests/custom-tls/15-verify-tls-replication.yaml index 306b0355eb..ecf421bd5e 100644 --- a/e2e-tests/tests/custom-tls/15-verify-tls-replication.yaml +++ b/e2e-tests/tests/custom-tls/15-verify-tls-replication.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -17,3 +16,4 @@ commands: echo "No SSL replication connections found after rotation, got: $repl_ssl_count" exit 1 fi + timeout: 30 diff --git a/e2e-tests/tests/custom-tls/16-verify-tls-pgbackrest.yaml b/e2e-tests/tests/custom-tls/16-verify-tls-pgbackrest.yaml index 60ce6bf398..249d83c57d 100644 --- a/e2e-tests/tests/custom-tls/16-verify-tls-pgbackrest.yaml +++ b/e2e-tests/tests/custom-tls/16-verify-tls-pgbackrest.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -28,3 +27,4 @@ commands: # Verify pgBackRest works over TLS, not just cert file existence kubectl -n "$NAMESPACE" exec "$instance" -c pgbackrest -- pgbackrest info + timeout: 30 diff --git a/e2e-tests/tests/custom-tls/17-write-data.yaml b/e2e-tests/tests/custom-tls/17-write-data.yaml index c933aa7a68..5c7d9c241c 100644 --- a/e2e-tests/tests/custom-tls/17-write-data.yaml +++ b/e2e-tests/tests/custom-tls/17-write-data.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -15,3 +14,4 @@ commands: run_psql_local \ '\c newapp \\\ INSERT INTO newApp (id) VALUES (100600)' \ "postgres:$(get_psql_user_pass custom-tls-pguser-postgres)@$(get_psql_user_host custom-tls-pguser-postgres)" + timeout: 30 diff --git a/e2e-tests/tests/custom-tls/18-verify-data-written-in-primary.yaml b/e2e-tests/tests/custom-tls/18-verify-data-written-in-primary.yaml index 46bede1ea4..d90efd2f54 100644 --- a/e2e-tests/tests/custom-tls/18-verify-data-written-in-primary.yaml +++ b/e2e-tests/tests/custom-tls/18-verify-data-written-in-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -14,3 +13,4 @@ commands: echo "Missing data in primary" exit 1 fi + timeout: 30 diff --git a/e2e-tests/tests/database-init-sql/00-deploy-operator.yaml b/e2e-tests/tests/database-init-sql/00-deploy-operator.yaml index 1aaca58be2..77cab8c26f 100644 --- a/e2e-tests/tests/database-init-sql/00-deploy-operator.yaml +++ b/e2e-tests/tests/database-init-sql/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: deploy_operator deploy_client + timeout: 10 diff --git a/e2e-tests/tests/database-init-sql/02-create-cluster.yaml b/e2e-tests/tests/database-init-sql/02-create-cluster.yaml index c427e5bd76..3c8b7ce224 100644 --- a/e2e-tests/tests/database-init-sql/02-create-cluster.yaml +++ b/e2e-tests/tests/database-init-sql/02-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -12,3 +11,4 @@ commands: | yq '.spec.databaseInitSQL.name = "init-database-sql"' \ | yq '.spec.databaseInitSQL.key = "init.sql"' \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/demand-backup-offline-snapshot/00-deploy-operator.yaml b/e2e-tests/tests/demand-backup-offline-snapshot/00-deploy-operator.yaml index 50c7842282..0d87b7f671 100644 --- a/e2e-tests/tests/demand-backup-offline-snapshot/00-deploy-operator.yaml +++ b/e2e-tests/tests/demand-backup-offline-snapshot/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -12,10 +11,11 @@ commands: PGO_FEATURE_GATES="BackupSnapshots=true" deploy_operator deploy_client deploy_s3_secrets + timeout: 10 --- apiVersion: snapshot.storage.k8s.io/v1 kind: VolumeSnapshotClass metadata: name: gke-snapshot-class driver: pd.csi.storage.gke.io -deletionPolicy: Delete \ No newline at end of file +deletionPolicy: Delete diff --git a/e2e-tests/tests/demand-backup-offline-snapshot/01-create-cluster.yaml b/e2e-tests/tests/demand-backup-offline-snapshot/01-create-cluster.yaml index a4162f966a..76d30d4cba 100644 --- a/e2e-tests/tests/demand-backup-offline-snapshot/01-create-cluster.yaml +++ b/e2e-tests/tests/demand-backup-offline-snapshot/01-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -17,3 +16,4 @@ commands: | yq ".spec.backups.volumeSnapshots.className=\"$snapshot_class\"" \ | yq '.spec.backups.volumeSnapshots.mode="offline"' \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/demand-backup-offline-snapshot/02-write-data.yaml b/e2e-tests/tests/demand-backup-offline-snapshot/02-write-data.yaml index 14ba9bf5e1..07347b6890 100644 --- a/e2e-tests/tests/demand-backup-offline-snapshot/02-write-data.yaml +++ b/e2e-tests/tests/demand-backup-offline-snapshot/02-write-data.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 60 commands: - script: |- set -o errexit @@ -15,3 +14,4 @@ commands: run_psql_local \ '\c myapp \\\ INSERT INTO myApp (id) VALUES (100500)' \ "postgres:$(get_psql_user_pass backup-snapshot-pguser-postgres)@$(get_psql_user_host backup-snapshot-pguser-postgres)" + timeout: 60 diff --git a/e2e-tests/tests/demand-backup-offline-snapshot/03-read-from-primary.yaml b/e2e-tests/tests/demand-backup-offline-snapshot/03-read-from-primary.yaml index a58c96e1c3..e0e031cb00 100644 --- a/e2e-tests/tests/demand-backup-offline-snapshot/03-read-from-primary.yaml +++ b/e2e-tests/tests/demand-backup-offline-snapshot/03-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass backup-snapshot-pguser-postgres)@$(get_psql_user_host backup-snapshot-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 03-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/demand-backup-offline-snapshot/06-verify-restored-data.yaml b/e2e-tests/tests/demand-backup-offline-snapshot/06-verify-restored-data.yaml index 1ecacd256c..a3192e73c8 100644 --- a/e2e-tests/tests/demand-backup-offline-snapshot/06-verify-restored-data.yaml +++ b/e2e-tests/tests/demand-backup-offline-snapshot/06-verify-restored-data.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass backup-snapshot-pguser-postgres)@$(get_psql_user_host backup-snapshot-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 06-verify-restored-data --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/demand-backup-offline-snapshot/10-verify-restored-data.yaml b/e2e-tests/tests/demand-backup-offline-snapshot/10-verify-restored-data.yaml index 05a7c8f0ae..77b89cd7ab 100644 --- a/e2e-tests/tests/demand-backup-offline-snapshot/10-verify-restored-data.yaml +++ b/e2e-tests/tests/demand-backup-offline-snapshot/10-verify-restored-data.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass backup-snapshot-pguser-postgres)@$(get_psql_user_host backup-snapshot-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 10-verify-restored-data --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/demand-backup-offline-snapshot/11-create-cluster-from-snapshot.yaml b/e2e-tests/tests/demand-backup-offline-snapshot/11-create-cluster-from-snapshot.yaml index bbc2494ad6..e68efbb623 100644 --- a/e2e-tests/tests/demand-backup-offline-snapshot/11-create-cluster-from-snapshot.yaml +++ b/e2e-tests/tests/demand-backup-offline-snapshot/11-create-cluster-from-snapshot.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -12,4 +11,5 @@ commands: | yq '.spec.instances[0].dataVolumeClaimSpec.dataSource.apiGroup="snapshot.storage.k8s.io"' \ | yq '.spec.instances[0].dataVolumeClaimSpec.dataSource.kind="VolumeSnapshot"' \ | yq '.spec.instances[0].dataVolumeClaimSpec.dataSource.name="backup3-pgdata"' \ - | kubectl -n "${NAMESPACE}" apply -f - \ No newline at end of file + | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/demand-backup-offline-snapshot/12-verify-restored-data.yaml b/e2e-tests/tests/demand-backup-offline-snapshot/12-verify-restored-data.yaml index 5fa88503c8..87b1726560 100644 --- a/e2e-tests/tests/demand-backup-offline-snapshot/12-verify-restored-data.yaml +++ b/e2e-tests/tests/demand-backup-offline-snapshot/12-verify-restored-data.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass cluster-from-snapshot-pguser-postgres)@$(get_psql_user_host cluster-from-snapshot-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 12-verify-restored-data --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/demand-backup/00-deploy-operator.yaml b/e2e-tests/tests/demand-backup/00-deploy-operator.yaml index 7faf4da852..b64878610d 100644 --- a/e2e-tests/tests/demand-backup/00-deploy-operator.yaml +++ b/e2e-tests/tests/demand-backup/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -12,3 +11,4 @@ commands: deploy_operator deploy_client deploy_s3_secrets + timeout: 10 diff --git a/e2e-tests/tests/demand-backup/01-create-cluster.yaml b/e2e-tests/tests/demand-backup/01-create-cluster.yaml index 9fb830c946..545eabe38f 100644 --- a/e2e-tests/tests/demand-backup/01-create-cluster.yaml +++ b/e2e-tests/tests/demand-backup/01-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 20 commands: - script: |- set -o errexit @@ -18,3 +17,4 @@ commands: | yq '.spec.backups.pgbackrest.jobs.backoffLimit=20' \ | yq '.spec.backups.pgbackrest.jobs.restartPolicy="OnFailure"' \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 20 diff --git a/e2e-tests/tests/demand-backup/03-read-from-primary.yaml b/e2e-tests/tests/demand-backup/03-read-from-primary.yaml index e00bcd1a14..f67a0eed16 100644 --- a/e2e-tests/tests/demand-backup/03-read-from-primary.yaml +++ b/e2e-tests/tests/demand-backup/03-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass demand-backup-pguser-postgres)@$(get_psql_user_host demand-backup-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 03-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/demand-backup/13-delete-backup.yaml b/e2e-tests/tests/demand-backup/13-delete-backup.yaml index 8f8803beca..31437cee67 100644 --- a/e2e-tests/tests/demand-backup/13-delete-backup.yaml +++ b/e2e-tests/tests/demand-backup/13-delete-backup.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 60 commands: - script: |- set -o errexit @@ -10,3 +9,4 @@ commands: kubectl delete pg-backup -n "${NAMESPACE}" demand-backup-full-repo1 kubectl delete pg-backup -n "${NAMESPACE}" demand-backup-full-repo3-2 + timeout: 60 diff --git a/e2e-tests/tests/demand-backup/19-verify-restored-data-repo1.yaml b/e2e-tests/tests/demand-backup/19-verify-restored-data-repo1.yaml index 3c95b04bff..ba2f8d3313 100644 --- a/e2e-tests/tests/demand-backup/19-verify-restored-data-repo1.yaml +++ b/e2e-tests/tests/demand-backup/19-verify-restored-data-repo1.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass demand-backup-pguser-postgres)@$(get_psql_user_host demand-backup-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 19-verify-restored-data --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/demand-backup/22-verify-restored-data-repo3.yaml b/e2e-tests/tests/demand-backup/22-verify-restored-data-repo3.yaml index 8d2ef37058..27eed69855 100644 --- a/e2e-tests/tests/demand-backup/22-verify-restored-data-repo3.yaml +++ b/e2e-tests/tests/demand-backup/22-verify-restored-data-repo3.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass demand-backup-pguser-postgres)@$(get_psql_user_host demand-backup-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 22-verify-restored-data --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/demand-backup/24-check-pgbackup-job.yaml b/e2e-tests/tests/demand-backup/24-check-pgbackup-job.yaml index ed169fb20e..491f0928c2 100644 --- a/e2e-tests/tests/demand-backup/24-check-pgbackup-job.yaml +++ b/e2e-tests/tests/demand-backup/24-check-pgbackup-job.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -9,3 +8,4 @@ commands: source ../../functions check_jobs_and_pgbackups "demand-backup" + timeout: 30 diff --git a/e2e-tests/tests/dynamic-configuration/00-deploy-operator.yaml b/e2e-tests/tests/dynamic-configuration/00-deploy-operator.yaml index 1aaca58be2..77cab8c26f 100644 --- a/e2e-tests/tests/dynamic-configuration/00-deploy-operator.yaml +++ b/e2e-tests/tests/dynamic-configuration/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: deploy_operator deploy_client + timeout: 10 diff --git a/e2e-tests/tests/dynamic-configuration/01-create-cluster.yaml b/e2e-tests/tests/dynamic-configuration/01-create-cluster.yaml index 7185cfcbfe..94d2f834f6 100644 --- a/e2e-tests/tests/dynamic-configuration/01-create-cluster.yaml +++ b/e2e-tests/tests/dynamic-configuration/01-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 20 commands: - script: |- set -o errexit @@ -10,3 +9,4 @@ commands: get_cr "cluster1" ${RANDOM} \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 20 diff --git a/e2e-tests/tests/dynamic-configuration/03-verify.yaml b/e2e-tests/tests/dynamic-configuration/03-verify.yaml index 62155dd69e..7aa274f49b 100644 --- a/e2e-tests/tests/dynamic-configuration/03-verify.yaml +++ b/e2e-tests/tests/dynamic-configuration/03-verify.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -19,3 +18,4 @@ commands: kubectl create configmap -n "${NAMESPACE}" 03-pg-settings \ --from-literal=wal_level="${wal_level}" \ --from-literal=restore_command="${restore_command}" + timeout: 30 diff --git a/e2e-tests/tests/finalizers/00-deploy-operator.yaml b/e2e-tests/tests/finalizers/00-deploy-operator.yaml index 1aaca58be2..77cab8c26f 100644 --- a/e2e-tests/tests/finalizers/00-deploy-operator.yaml +++ b/e2e-tests/tests/finalizers/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: deploy_operator deploy_client + timeout: 10 diff --git a/e2e-tests/tests/finalizers/01-create-cluster.yaml b/e2e-tests/tests/finalizers/01-create-cluster.yaml index bdb0b42829..158b42aa3d 100644 --- a/e2e-tests/tests/finalizers/01-create-cluster.yaml +++ b/e2e-tests/tests/finalizers/01-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: get_cr \ | yq eval '.metadata.finalizers += ["percona.com/delete-pvc", "percona.com/delete-ssl"]' \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/finalizers/03-create-cluster.yaml b/e2e-tests/tests/finalizers/03-create-cluster.yaml index cf3c84716f..ae80106064 100644 --- a/e2e-tests/tests/finalizers/03-create-cluster.yaml +++ b/e2e-tests/tests/finalizers/03-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: get_cr "finalizers-2" \ | yq eval '.metadata.finalizers += ["percona.com/delete-pvc", "percona.com/delete-ssl"]' \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/huge-pages/00-deploy-operator.yaml b/e2e-tests/tests/huge-pages/00-deploy-operator.yaml index c35cee0284..77cab8c26f 100644 --- a/e2e-tests/tests/huge-pages/00-deploy-operator.yaml +++ b/e2e-tests/tests/huge-pages/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -10,4 +9,5 @@ commands: init_temp_dir # do this only in the first TestStep deploy_operator - deploy_client \ No newline at end of file + deploy_client + timeout: 10 diff --git a/e2e-tests/tests/huge-pages/01-create-cluster.yaml b/e2e-tests/tests/huge-pages/01-create-cluster.yaml index c60904ccd5..25b7868b71 100644 --- a/e2e-tests/tests/huge-pages/01-create-cluster.yaml +++ b/e2e-tests/tests/huge-pages/01-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 20 commands: - script: |- set -o errexit @@ -15,4 +14,5 @@ commands: | yq '.spec.instances[].replicas=1' \ | yq '.spec.instances[0].resources.limits.memory = "4Gi"' \ | yq '.spec.patroni.dynamicConfiguration.postgresql.parameters.shared_buffers = "1GB"' \ - | kubectl -n "${NAMESPACE}" apply -f - \ No newline at end of file + | kubectl -n "${NAMESPACE}" apply -f - + timeout: 20 diff --git a/e2e-tests/tests/huge-pages/02-verify-hugepages.yaml b/e2e-tests/tests/huge-pages/02-verify-hugepages.yaml index 231f81c126..70e8658ca9 100644 --- a/e2e-tests/tests/huge-pages/02-verify-hugepages.yaml +++ b/e2e-tests/tests/huge-pages/02-verify-hugepages.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 120 commands: - script: |- set -o errexit @@ -26,4 +25,5 @@ commands: # Verify usage verify_hugepages_usage "${PRIMARY}" "${NAMESPACE}" "database" - echo "Hugepages verification passed" \ No newline at end of file + echo "Hugepages verification passed" + timeout: 120 \ No newline at end of file diff --git a/e2e-tests/tests/init-deploy/00-deploy-operator.yaml b/e2e-tests/tests/init-deploy/00-deploy-operator.yaml index 1aaca58be2..77cab8c26f 100644 --- a/e2e-tests/tests/init-deploy/00-deploy-operator.yaml +++ b/e2e-tests/tests/init-deploy/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: deploy_operator deploy_client + timeout: 10 diff --git a/e2e-tests/tests/init-deploy/01-create-cluster.yaml b/e2e-tests/tests/init-deploy/01-create-cluster.yaml index 515e681822..91c1d9478c 100644 --- a/e2e-tests/tests/init-deploy/01-create-cluster.yaml +++ b/e2e-tests/tests/init-deploy/01-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -14,3 +13,4 @@ commands: | yq '.spec.backups.pgbackrest.repoHost.resources.limits.cpu = "200m"' \ | yq '.spec.backups.pgbackrest.repoHost.resources.limits.memory = "128Mi"' \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/init-deploy/03-read-from-primary.yaml b/e2e-tests/tests/init-deploy/03-read-from-primary.yaml index e622117937..2373247985 100644 --- a/e2e-tests/tests/init-deploy/03-read-from-primary.yaml +++ b/e2e-tests/tests/init-deploy/03-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -9,4 +8,5 @@ commands: source ../../functions data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass init-deploy-pguser-postgres)@$(get_psql_user_host init-deploy-pguser-postgres)") - kubectl create configmap -n "${NAMESPACE}" 03-read-from-primary --from-literal=data="${data}" \ No newline at end of file + kubectl create configmap -n "${NAMESPACE}" 03-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/ldap-tls/00-deploy-operator.yaml b/e2e-tests/tests/ldap-tls/00-deploy-operator.yaml index 9e2d6a12b5..fb46029734 100644 --- a/e2e-tests/tests/ldap-tls/00-deploy-operator.yaml +++ b/e2e-tests/tests/ldap-tls/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -17,3 +16,4 @@ commands: deploy_operator deploy_client deploy_cert_manager + timeout: 10 \ No newline at end of file diff --git a/e2e-tests/tests/ldap-tls/03-cluster.yaml b/e2e-tests/tests/ldap-tls/03-cluster.yaml index 5ae2e7999c..f347300f86 100644 --- a/e2e-tests/tests/ldap-tls/03-cluster.yaml +++ b/e2e-tests/tests/ldap-tls/03-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -15,3 +14,4 @@ commands: .spec.config.files = [{"secret":{"name":"ldap-ca","items":[{"key":"ca.crt","path":"ldap/ca.crt"}]}}] ' - \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/ldap/00-deploy-operator.yaml b/e2e-tests/tests/ldap/00-deploy-operator.yaml index dbea2a35c5..e351281c42 100644 --- a/e2e-tests/tests/ldap/00-deploy-operator.yaml +++ b/e2e-tests/tests/ldap/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -16,3 +15,4 @@ commands: deploy_operator deploy_client + timeout: 10 \ No newline at end of file diff --git a/e2e-tests/tests/ldap/02-cluster.yaml b/e2e-tests/tests/ldap/02-cluster.yaml index d0fd158992..0ed7be0e3c 100644 --- a/e2e-tests/tests/ldap/02-cluster.yaml +++ b/e2e-tests/tests/ldap/02-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -14,3 +13,4 @@ commands: .spec.authentication.rules = [{"connection":"host","method":"ldap","users":["percona"],"options":{"ldapserver":"openldap","ldapport":389,"ldapprefix":"uid=","ldapsuffix":",ou=perconadba,dc=ldap,dc=local"}}] ' - \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/major-upgrade/00-deploy-operator.yaml b/e2e-tests/tests/major-upgrade/00-deploy-operator.yaml index 7faf4da852..b64878610d 100644 --- a/e2e-tests/tests/major-upgrade/00-deploy-operator.yaml +++ b/e2e-tests/tests/major-upgrade/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -12,3 +11,4 @@ commands: deploy_operator deploy_client deploy_s3_secrets + timeout: 10 diff --git a/e2e-tests/tests/major-upgrade/01-create-cluster.yaml b/e2e-tests/tests/major-upgrade/01-create-cluster.yaml index adb3d39877..879967d7fe 100644 --- a/e2e-tests/tests/major-upgrade/01-create-cluster.yaml +++ b/e2e-tests/tests/major-upgrade/01-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -18,3 +17,4 @@ commands: .spec.patroni.dynamicConfiguration.postgresql.parameters.shared_preload_libraries = "pg_cron" | .spec.extensions.custom += [{"name": "pg_cron", "version": "1.6.6"}]' \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/major-upgrade/03-read-from-primary.yaml b/e2e-tests/tests/major-upgrade/03-read-from-primary.yaml index 64ad0782ac..107ee05990 100644 --- a/e2e-tests/tests/major-upgrade/03-read-from-primary.yaml +++ b/e2e-tests/tests/major-upgrade/03-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -9,4 +8,5 @@ commands: source ../../functions data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)") - kubectl create configmap -n "${NAMESPACE}" 03-read-from-primary --from-literal=data="${data}" \ No newline at end of file + kubectl create configmap -n "${NAMESPACE}" 03-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/major-upgrade/07-read-from-primary.yaml b/e2e-tests/tests/major-upgrade/07-read-from-primary.yaml index bfa5e93458..364ffd464d 100644 --- a/e2e-tests/tests/major-upgrade/07-read-from-primary.yaml +++ b/e2e-tests/tests/major-upgrade/07-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -9,4 +8,5 @@ commands: source ../../functions data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)") - kubectl create configmap -n "${NAMESPACE}" 07-read-from-primary --from-literal=data="${data}" \ No newline at end of file + kubectl create configmap -n "${NAMESPACE}" 07-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/major-upgrade/11-read-from-primary.yaml b/e2e-tests/tests/major-upgrade/11-read-from-primary.yaml index 7ecb6090a2..6560082e62 100644 --- a/e2e-tests/tests/major-upgrade/11-read-from-primary.yaml +++ b/e2e-tests/tests/major-upgrade/11-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -9,4 +8,5 @@ commands: source ../../functions data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)") - kubectl create configmap -n "${NAMESPACE}" 11-read-from-primary --from-literal=data="${data}" \ No newline at end of file + kubectl create configmap -n "${NAMESPACE}" 11-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/major-upgrade/15-read-from-primary.yaml b/e2e-tests/tests/major-upgrade/15-read-from-primary.yaml index 23a10ac997..e95d065d07 100644 --- a/e2e-tests/tests/major-upgrade/15-read-from-primary.yaml +++ b/e2e-tests/tests/major-upgrade/15-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -9,4 +8,5 @@ commands: source ../../functions data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)") - kubectl create configmap -n "${NAMESPACE}" 15-read-from-primary --from-literal=data="${data}" \ No newline at end of file + kubectl create configmap -n "${NAMESPACE}" 15-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/major-upgrade/19-read-from-primary.yaml b/e2e-tests/tests/major-upgrade/19-read-from-primary.yaml index f835a311f5..0beb8ddbc2 100644 --- a/e2e-tests/tests/major-upgrade/19-read-from-primary.yaml +++ b/e2e-tests/tests/major-upgrade/19-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -10,3 +9,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 19-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/major-upgrade/23-read-from-primary.yaml b/e2e-tests/tests/major-upgrade/23-read-from-primary.yaml index 48798197b8..29c0341888 100644 --- a/e2e-tests/tests/major-upgrade/23-read-from-primary.yaml +++ b/e2e-tests/tests/major-upgrade/23-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -10,3 +9,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 23-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/migration-backup-s3/00-start-v1-operator.yaml b/e2e-tests/tests/migration-backup-s3/00-start-v1-operator.yaml index fb185790bf..b066bc190d 100644 --- a/e2e-tests/tests/migration-backup-s3/00-start-v1-operator.yaml +++ b/e2e-tests/tests/migration-backup-s3/00-start-v1-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -24,3 +23,4 @@ commands: $sed -r 's/^( namespace:).*pgo.*$/\1 \"'$NAMESPACE'\"/g' | $sed -r 's/^( pgo_operator_namespace:).*pgo.*$/\1 \"'$OPNS'\"/g' | kubectl -n $NAMESPACE apply -f - + timeout: 10 diff --git a/e2e-tests/tests/migration-backup-s3/01-remove-v1-deployer.yaml b/e2e-tests/tests/migration-backup-s3/01-remove-v1-deployer.yaml index c2129ac495..782b2d07a3 100644 --- a/e2e-tests/tests/migration-backup-s3/01-remove-v1-deployer.yaml +++ b/e2e-tests/tests/migration-backup-s3/01-remove-v1-deployer.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -20,3 +19,4 @@ commands: sed -r 's/^( namespace:).*pgo.*$/\1 \"'$NAMESPACE'\"/g' | sed -r 's/^( pgo_operator_namespace:).*pgo.*$/\1 \"'$OPNS'\"/g' | kubectl -n $NAMESPACE delete -f - + timeout: 10 diff --git a/e2e-tests/tests/migration-backup-s3/02-start-v1-cluster.yaml b/e2e-tests/tests/migration-backup-s3/02-start-v1-cluster.yaml index dafcb8d99a..59cc428bd4 100644 --- a/e2e-tests/tests/migration-backup-s3/02-start-v1-cluster.yaml +++ b/e2e-tests/tests/migration-backup-s3/02-start-v1-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -35,3 +34,4 @@ commands: ' - | $sed -r 's/cluster1/'$V1_CLUSTER_NAME'/g' | kubectl -n $NAMESPACE apply -f - + timeout: 10 diff --git a/e2e-tests/tests/migration-backup-s3/04-read-from-primary.yaml b/e2e-tests/tests/migration-backup-s3/04-read-from-primary.yaml index 3d36069e9b..f3c08a78d3 100644 --- a/e2e-tests/tests/migration-backup-s3/04-read-from-primary.yaml +++ b/e2e-tests/tests/migration-backup-s3/04-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -14,3 +13,4 @@ commands: data=$(run_psql '\c myapp \\\ SELECT * from myApp;' "postgres://postgres:$POSTGRES_V1_PASS@$POSTGRES_V1_CLUSTER_NAME") kubectl create configmap -n "$NAMESPACE" 04-read-from-primary --from-literal=data="$data" + timeout: 30 diff --git a/e2e-tests/tests/migration-backup-s3/08-deploy-operator.yaml b/e2e-tests/tests/migration-backup-s3/08-deploy-operator.yaml index d106b7dba6..9d63f234b3 100644 --- a/e2e-tests/tests/migration-backup-s3/08-deploy-operator.yaml +++ b/e2e-tests/tests/migration-backup-s3/08-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -9,4 +8,5 @@ commands: source ../../functions deploy_operator - deploy_s3_secrets \ No newline at end of file + deploy_s3_secrets + timeout: 10 diff --git a/e2e-tests/tests/migration-backup-s3/10-read-from-primary.yaml b/e2e-tests/tests/migration-backup-s3/10-read-from-primary.yaml index d35cf9e852..7bffe205d9 100644 --- a/e2e-tests/tests/migration-backup-s3/10-read-from-primary.yaml +++ b/e2e-tests/tests/migration-backup-s3/10-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql '\c myapp \\\ SELECT * from myApp;' "postgres://postgres:$(get_psql_user_pass migration-backup-s3-pguser-postgres)@$(get_psql_user_host migration-backup-s3-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 11-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/migration-backup-s3/12-read-from-primary.yaml b/e2e-tests/tests/migration-backup-s3/12-read-from-primary.yaml index 95660ef21a..bdd9740de5 100644 --- a/e2e-tests/tests/migration-backup-s3/12-read-from-primary.yaml +++ b/e2e-tests/tests/migration-backup-s3/12-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql '\c myapp \\\ SELECT * from myApp;' "postgres://postgres:$(get_psql_user_pass migration-backup-s3-pguser-postgres)@$(get_psql_user_host migration-backup-s3-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 12-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/migration-data-volumes/00-start-v1-operator.yaml b/e2e-tests/tests/migration-data-volumes/00-start-v1-operator.yaml index fb185790bf..b066bc190d 100644 --- a/e2e-tests/tests/migration-data-volumes/00-start-v1-operator.yaml +++ b/e2e-tests/tests/migration-data-volumes/00-start-v1-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -24,3 +23,4 @@ commands: $sed -r 's/^( namespace:).*pgo.*$/\1 \"'$NAMESPACE'\"/g' | $sed -r 's/^( pgo_operator_namespace:).*pgo.*$/\1 \"'$OPNS'\"/g' | kubectl -n $NAMESPACE apply -f - + timeout: 10 diff --git a/e2e-tests/tests/migration-data-volumes/01-remove-v1-deployer.yaml b/e2e-tests/tests/migration-data-volumes/01-remove-v1-deployer.yaml index c2129ac495..782b2d07a3 100644 --- a/e2e-tests/tests/migration-data-volumes/01-remove-v1-deployer.yaml +++ b/e2e-tests/tests/migration-data-volumes/01-remove-v1-deployer.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -20,3 +19,4 @@ commands: sed -r 's/^( namespace:).*pgo.*$/\1 \"'$NAMESPACE'\"/g' | sed -r 's/^( pgo_operator_namespace:).*pgo.*$/\1 \"'$OPNS'\"/g' | kubectl -n $NAMESPACE delete -f - + timeout: 10 diff --git a/e2e-tests/tests/migration-data-volumes/02-start-v1-cluster.yaml b/e2e-tests/tests/migration-data-volumes/02-start-v1-cluster.yaml index 8947f1de8d..5769f40ecc 100644 --- a/e2e-tests/tests/migration-data-volumes/02-start-v1-cluster.yaml +++ b/e2e-tests/tests/migration-data-volumes/02-start-v1-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -29,3 +28,4 @@ commands: .spec.pgBouncer.image="percona/percona-postgresql-operator:'$PGOV1_TAG'-ppg'$PGOV1_VER'-pgbouncer"' - | $sed -r 's/cluster1/'$V1_CLUSTER_NAME'/g' | kubectl -n $NAMESPACE apply -f - + timeout: 10 diff --git a/e2e-tests/tests/migration-data-volumes/04-read-from-primary.yaml b/e2e-tests/tests/migration-data-volumes/04-read-from-primary.yaml index 3d36069e9b..f3c08a78d3 100644 --- a/e2e-tests/tests/migration-data-volumes/04-read-from-primary.yaml +++ b/e2e-tests/tests/migration-data-volumes/04-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -14,3 +13,4 @@ commands: data=$(run_psql '\c myapp \\\ SELECT * from myApp;' "postgres://postgres:$POSTGRES_V1_PASS@$POSTGRES_V1_CLUSTER_NAME") kubectl create configmap -n "$NAMESPACE" 04-read-from-primary --from-literal=data="$data" + timeout: 30 diff --git a/e2e-tests/tests/migration-data-volumes/05-deploy-operator.yaml b/e2e-tests/tests/migration-data-volumes/05-deploy-operator.yaml index d106b7dba6..9d63f234b3 100644 --- a/e2e-tests/tests/migration-data-volumes/05-deploy-operator.yaml +++ b/e2e-tests/tests/migration-data-volumes/05-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -9,4 +8,5 @@ commands: source ../../functions deploy_operator - deploy_s3_secrets \ No newline at end of file + deploy_s3_secrets + timeout: 10 diff --git a/e2e-tests/tests/migration-data-volumes/10-read-from-primary.yaml b/e2e-tests/tests/migration-data-volumes/10-read-from-primary.yaml index 833f852f5d..0809ea70e7 100644 --- a/e2e-tests/tests/migration-data-volumes/10-read-from-primary.yaml +++ b/e2e-tests/tests/migration-data-volumes/10-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql '\c myapp \\\ SELECT * from myApp;' "postgres://postgres:$(get_psql_user_pass migration-data-volumes-pguser-postgres)@$(get_psql_user_host migration-data-volumes-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 10-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/migration-data-volumes/12-read-from-primary.yaml b/e2e-tests/tests/migration-data-volumes/12-read-from-primary.yaml index 9e7c28319c..8396a96a4e 100644 --- a/e2e-tests/tests/migration-data-volumes/12-read-from-primary.yaml +++ b/e2e-tests/tests/migration-data-volumes/12-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql '\c myapp \\\ SELECT * from myApp;' "postgres://postgres:$(get_psql_user_pass migration-data-volumes-pguser-postgres)@$(get_psql_user_host migration-data-volumes-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 12-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/monitoring-pmm3/00-deploy-operator.yaml b/e2e-tests/tests/monitoring-pmm3/00-deploy-operator.yaml index 1aaca58be2..77cab8c26f 100644 --- a/e2e-tests/tests/monitoring-pmm3/00-deploy-operator.yaml +++ b/e2e-tests/tests/monitoring-pmm3/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: deploy_operator deploy_client + timeout: 10 diff --git a/e2e-tests/tests/monitoring-pmm3/03-create-cluster.yaml b/e2e-tests/tests/monitoring-pmm3/03-create-cluster.yaml index 1b090182b9..42718dd401 100644 --- a/e2e-tests/tests/monitoring-pmm3/03-create-cluster.yaml +++ b/e2e-tests/tests/monitoring-pmm3/03-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -12,3 +11,4 @@ commands: | yq eval '.spec.pmm.enabled=true' - \ | yq eval ".spec.pmm.image=\"${IMAGE_PMM3_CLIENT}\"" - \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/monitoring/00-deploy-operator.yaml b/e2e-tests/tests/monitoring/00-deploy-operator.yaml index 1aaca58be2..77cab8c26f 100644 --- a/e2e-tests/tests/monitoring/00-deploy-operator.yaml +++ b/e2e-tests/tests/monitoring/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: deploy_operator deploy_client + timeout: 10 diff --git a/e2e-tests/tests/monitoring/03-create-cluster.yaml b/e2e-tests/tests/monitoring/03-create-cluster.yaml index b1d288083b..ffed37ba95 100644 --- a/e2e-tests/tests/monitoring/03-create-cluster.yaml +++ b/e2e-tests/tests/monitoring/03-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: get_cr \ | yq eval '.spec.pmm.enabled=true' - \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/monitoring/04-update-pmm-api-key.yaml b/e2e-tests/tests/monitoring/04-update-pmm-api-key.yaml index 9fc8bf6500..0e7fa8b751 100644 --- a/e2e-tests/tests/monitoring/04-update-pmm-api-key.yaml +++ b/e2e-tests/tests/monitoring/04-update-pmm-api-key.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 25 commands: - script: |- set -o errexit @@ -14,3 +13,4 @@ commands: || true sleep 25 + timeout: 25 diff --git a/e2e-tests/tests/one-pod/00-deploy-operator.yaml b/e2e-tests/tests/one-pod/00-deploy-operator.yaml index 7faf4da852..b64878610d 100644 --- a/e2e-tests/tests/one-pod/00-deploy-operator.yaml +++ b/e2e-tests/tests/one-pod/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -12,3 +11,4 @@ commands: deploy_operator deploy_client deploy_s3_secrets + timeout: 10 diff --git a/e2e-tests/tests/one-pod/01-create-cluster.yaml b/e2e-tests/tests/one-pod/01-create-cluster.yaml index b60717231a..d82a72d836 100644 --- a/e2e-tests/tests/one-pod/01-create-cluster.yaml +++ b/e2e-tests/tests/one-pod/01-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -13,3 +12,4 @@ commands: .spec.proxy.pgBouncer.replicas=1 | .spec.instances[].replicas=1' - \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/one-pod/03-read-from-primary.yaml b/e2e-tests/tests/one-pod/03-read-from-primary.yaml index 6d0c0a7a2c..70f9ff80ac 100644 --- a/e2e-tests/tests/one-pod/03-read-from-primary.yaml +++ b/e2e-tests/tests/one-pod/03-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass one-pod-pguser-postgres)@$(get_psql_user_host one-pod-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 03-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/one-pod/08-verify-restored-data.yaml b/e2e-tests/tests/one-pod/08-verify-restored-data.yaml index 1f22fbab86..ef91879b72 100644 --- a/e2e-tests/tests/one-pod/08-verify-restored-data.yaml +++ b/e2e-tests/tests/one-pod/08-verify-restored-data.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass one-pod-pguser-postgres)@$(get_psql_user_host one-pod-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 08-verify-restored-data --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/one-pod/09-check-pgbackup-job.yaml b/e2e-tests/tests/one-pod/09-check-pgbackup-job.yaml index f95f1e2c3b..2c20acfc1d 100644 --- a/e2e-tests/tests/one-pod/09-check-pgbackup-job.yaml +++ b/e2e-tests/tests/one-pod/09-check-pgbackup-job.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -9,3 +8,4 @@ commands: source ../../functions check_jobs_and_pgbackups "one-pod" + timeout: 30 diff --git a/e2e-tests/tests/operator-self-healing/00-deploy-operator.yaml b/e2e-tests/tests/operator-self-healing/00-deploy-operator.yaml index 1aaca58be2..77cab8c26f 100644 --- a/e2e-tests/tests/operator-self-healing/00-deploy-operator.yaml +++ b/e2e-tests/tests/operator-self-healing/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: deploy_operator deploy_client + timeout: 10 diff --git a/e2e-tests/tests/operator-self-healing/01-deploy-chaos-mesh.yaml b/e2e-tests/tests/operator-self-healing/01-deploy-chaos-mesh.yaml index 2fcde50277..435ce92e5d 100644 --- a/e2e-tests/tests/operator-self-healing/01-deploy-chaos-mesh.yaml +++ b/e2e-tests/tests/operator-self-healing/01-deploy-chaos-mesh.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -9,3 +8,4 @@ commands: source ../../functions deploy_chaos_mesh + timeout: 10 diff --git a/e2e-tests/tests/operator-self-healing/02-create-cluster.yaml b/e2e-tests/tests/operator-self-healing/02-create-cluster.yaml index abe1d5a61a..3d84380333 100644 --- a/e2e-tests/tests/operator-self-healing/02-create-cluster.yaml +++ b/e2e-tests/tests/operator-self-healing/02-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -9,3 +8,4 @@ commands: source ../../functions get_cr | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/operator-self-healing/04-read-from-primary.yaml b/e2e-tests/tests/operator-self-healing/04-read-from-primary.yaml index 4a35b39807..62c8cfca81 100644 --- a/e2e-tests/tests/operator-self-healing/04-read-from-primary.yaml +++ b/e2e-tests/tests/operator-self-healing/04-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -10,3 +9,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass operator-self-healing-pguser-postgres)@$(get_psql_user_host operator-self-healing-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 04-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/operator-self-healing/05-kill-pod.yaml b/e2e-tests/tests/operator-self-healing/05-kill-pod.yaml index e35c8a6aec..12cbb674cf 100644 --- a/e2e-tests/tests/operator-self-healing/05-kill-pod.yaml +++ b/e2e-tests/tests/operator-self-healing/05-kill-pod.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -17,3 +16,4 @@ commands: echo "operator pod was not killed! something went wrong." exit 1 fi + timeout: 30 diff --git a/e2e-tests/tests/operator-self-healing/06-scale-up.yaml b/e2e-tests/tests/operator-self-healing/06-scale-up.yaml index bf1074cf1c..6975e58658 100644 --- a/e2e-tests/tests/operator-self-healing/06-scale-up.yaml +++ b/e2e-tests/tests/operator-self-healing/06-scale-up.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: get_cr \ | yq eval '.spec.proxy.pgBouncer.replicas=5' - \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/operator-self-healing/07-network-loss.yaml b/e2e-tests/tests/operator-self-healing/07-network-loss.yaml index b19885cddf..7f01a51d11 100644 --- a/e2e-tests/tests/operator-self-healing/07-network-loss.yaml +++ b/e2e-tests/tests/operator-self-healing/07-network-loss.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -10,3 +9,4 @@ commands: network_loss "${OPERATOR_NS:-$NAMESPACE}" "$(get_operator_pod)" sleep 30 # wait for network loss to happen + timeout: 30 diff --git a/e2e-tests/tests/operator-self-healing/08-scale-down.yaml b/e2e-tests/tests/operator-self-healing/08-scale-down.yaml index 725083e04a..72e872f674 100644 --- a/e2e-tests/tests/operator-self-healing/08-scale-down.yaml +++ b/e2e-tests/tests/operator-self-healing/08-scale-down.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: get_cr \ | yq eval '.spec.proxy.pgBouncer.replicas=3' - \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/operator-self-healing/09-pod-failure.yaml b/e2e-tests/tests/operator-self-healing/09-pod-failure.yaml index e37ba4dd89..6a28b087c5 100644 --- a/e2e-tests/tests/operator-self-healing/09-pod-failure.yaml +++ b/e2e-tests/tests/operator-self-healing/09-pod-failure.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -10,3 +9,4 @@ commands: failure_pod "${OPERATOR_NS:-$NAMESPACE}" "$(get_operator_pod)" sleep 30 # wait for pod failure to happen + timeout: 30 diff --git a/e2e-tests/tests/operator-self-healing/10-scale-up.yaml b/e2e-tests/tests/operator-self-healing/10-scale-up.yaml index bf1074cf1c..6975e58658 100644 --- a/e2e-tests/tests/operator-self-healing/10-scale-up.yaml +++ b/e2e-tests/tests/operator-self-healing/10-scale-up.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: get_cr \ | yq eval '.spec.proxy.pgBouncer.replicas=5' - \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/operator-self-healing/98-destroy-chaos-mesh.yaml b/e2e-tests/tests/operator-self-healing/98-destroy-chaos-mesh.yaml index 3f0cbc6b8e..bfc7f32499 100644 --- a/e2e-tests/tests/operator-self-healing/98-destroy-chaos-mesh.yaml +++ b/e2e-tests/tests/operator-self-healing/98-destroy-chaos-mesh.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 120 commands: - script: |- set -o errexit @@ -10,3 +9,4 @@ commands: destroy_chaos_mesh timeout: 120 + timeout: 120 diff --git a/e2e-tests/tests/pitr/00-deploy-operator.yaml b/e2e-tests/tests/pitr/00-deploy-operator.yaml index 7faf4da852..b64878610d 100644 --- a/e2e-tests/tests/pitr/00-deploy-operator.yaml +++ b/e2e-tests/tests/pitr/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -12,3 +11,4 @@ commands: deploy_operator deploy_client deploy_s3_secrets + timeout: 10 diff --git a/e2e-tests/tests/pitr/01-create-cluster.yaml b/e2e-tests/tests/pitr/01-create-cluster.yaml index e9532cc243..145f7febaa 100644 --- a/e2e-tests/tests/pitr/01-create-cluster.yaml +++ b/e2e-tests/tests/pitr/01-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -9,3 +8,4 @@ commands: source ../../functions get_cr "pitr" ${RANDOM}| kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/pitr/03-read-from-primary.yaml b/e2e-tests/tests/pitr/03-read-from-primary.yaml index 436ab62c5b..3eb1ff67ec 100644 --- a/e2e-tests/tests/pitr/03-read-from-primary.yaml +++ b/e2e-tests/tests/pitr/03-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass pitr-pguser-postgres)@$(get_psql_user_host pitr-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 03-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/pitr/06-verify-restored-data.yaml b/e2e-tests/tests/pitr/06-verify-restored-data.yaml index 6ca9d6fe7d..f3475f5849 100644 --- a/e2e-tests/tests/pitr/06-verify-restored-data.yaml +++ b/e2e-tests/tests/pitr/06-verify-restored-data.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass pitr-pguser-postgres)@$(get_psql_user_host pitr-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 06-verify-restored-data --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/scaling/00-deploy-operator.yaml b/e2e-tests/tests/scaling/00-deploy-operator.yaml index 1aaca58be2..77cab8c26f 100644 --- a/e2e-tests/tests/scaling/00-deploy-operator.yaml +++ b/e2e-tests/tests/scaling/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: deploy_operator deploy_client + timeout: 10 diff --git a/e2e-tests/tests/scaling/01-create-one-pod-cluster.yaml b/e2e-tests/tests/scaling/01-create-one-pod-cluster.yaml index b60717231a..d82a72d836 100644 --- a/e2e-tests/tests/scaling/01-create-one-pod-cluster.yaml +++ b/e2e-tests/tests/scaling/01-create-one-pod-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -13,3 +12,4 @@ commands: .spec.proxy.pgBouncer.replicas=1 | .spec.instances[].replicas=1' - \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/scaling/03-read-from-primary.yaml b/e2e-tests/tests/scaling/03-read-from-primary.yaml index 268b47339a..b18c1f74e2 100644 --- a/e2e-tests/tests/scaling/03-read-from-primary.yaml +++ b/e2e-tests/tests/scaling/03-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass scaling-pguser-postgres)@$(get_psql_user_host scaling-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 03-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/scaling/04-scale-up-to-three.yaml b/e2e-tests/tests/scaling/04-scale-up-to-three.yaml index d76b1f2519..33adb0b1b8 100644 --- a/e2e-tests/tests/scaling/04-scale-up-to-three.yaml +++ b/e2e-tests/tests/scaling/04-scale-up-to-three.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -13,3 +12,4 @@ commands: .spec.proxy.pgBouncer.replicas=3 | .spec.instances[].replicas=3' - \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/scaling/06-read-from-all-pods.yaml b/e2e-tests/tests/scaling/06-read-from-all-pods.yaml index 6c51302b0c..1f31929948 100644 --- a/e2e-tests/tests/scaling/06-read-from-all-pods.yaml +++ b/e2e-tests/tests/scaling/06-read-from-all-pods.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -15,3 +14,4 @@ commands: kubectl create configmap -n "${NAMESPACE}" 06-read-from-${i} --from-literal=data="${data}" i=$((i+1)) done + timeout: 30 diff --git a/e2e-tests/tests/scaling/07-scale-up-to-five.yaml b/e2e-tests/tests/scaling/07-scale-up-to-five.yaml index ca1e1b664f..98dafb7f6e 100644 --- a/e2e-tests/tests/scaling/07-scale-up-to-five.yaml +++ b/e2e-tests/tests/scaling/07-scale-up-to-five.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -13,3 +12,4 @@ commands: .spec.proxy.pgBouncer.replicas=5 | .spec.instances[].replicas=5' - \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/scaling/09-read-from-all-pods.yaml b/e2e-tests/tests/scaling/09-read-from-all-pods.yaml index 28accdb2f6..598b9b9705 100644 --- a/e2e-tests/tests/scaling/09-read-from-all-pods.yaml +++ b/e2e-tests/tests/scaling/09-read-from-all-pods.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -15,3 +14,4 @@ commands: kubectl create configmap -n "${NAMESPACE}" 09-read-from-${i} --from-literal=data="${data}" i=$((i+1)) done + timeout: 30 diff --git a/e2e-tests/tests/scaling/10-scale-down-to-three.yaml b/e2e-tests/tests/scaling/10-scale-down-to-three.yaml index d76b1f2519..33adb0b1b8 100644 --- a/e2e-tests/tests/scaling/10-scale-down-to-three.yaml +++ b/e2e-tests/tests/scaling/10-scale-down-to-three.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -13,3 +12,4 @@ commands: .spec.proxy.pgBouncer.replicas=3 | .spec.instances[].replicas=3' - \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/scaling/12-read-from-all-pods.yaml b/e2e-tests/tests/scaling/12-read-from-all-pods.yaml index 32d2d07d7d..157c04cf87 100644 --- a/e2e-tests/tests/scaling/12-read-from-all-pods.yaml +++ b/e2e-tests/tests/scaling/12-read-from-all-pods.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -15,3 +14,4 @@ commands: kubectl create configmap -n "${NAMESPACE}" 12-read-from-${i} --from-literal=data="${data}" i=$((i+1)) done + timeout: 30 diff --git a/e2e-tests/tests/scaling/13-scale-down-to-one.yaml b/e2e-tests/tests/scaling/13-scale-down-to-one.yaml index b60717231a..d82a72d836 100644 --- a/e2e-tests/tests/scaling/13-scale-down-to-one.yaml +++ b/e2e-tests/tests/scaling/13-scale-down-to-one.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -13,3 +12,4 @@ commands: .spec.proxy.pgBouncer.replicas=1 | .spec.instances[].replicas=1' - \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/scaling/15-read-from-primary.yaml b/e2e-tests/tests/scaling/15-read-from-primary.yaml index a20c81f74b..ac9fcfcffc 100644 --- a/e2e-tests/tests/scaling/15-read-from-primary.yaml +++ b/e2e-tests/tests/scaling/15-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass scaling-pguser-postgres)@$(get_psql_user_host scaling-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 15-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/scheduled-backup/00-deploy-operator.yaml b/e2e-tests/tests/scheduled-backup/00-deploy-operator.yaml index 7faf4da852..b64878610d 100644 --- a/e2e-tests/tests/scheduled-backup/00-deploy-operator.yaml +++ b/e2e-tests/tests/scheduled-backup/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -12,3 +11,4 @@ commands: deploy_operator deploy_client deploy_s3_secrets + timeout: 10 diff --git a/e2e-tests/tests/scheduled-backup/01-create-cluster.yaml b/e2e-tests/tests/scheduled-backup/01-create-cluster.yaml index 1ad7bdf336..881930f72e 100644 --- a/e2e-tests/tests/scheduled-backup/01-create-cluster.yaml +++ b/e2e-tests/tests/scheduled-backup/01-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: get_cr "scheduled-backup" ${RANDOM} \ | yq '.metadata.finalizers=["percona.com/delete-backups"]' \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/scheduled-backup/03-read-from-primary.yaml b/e2e-tests/tests/scheduled-backup/03-read-from-primary.yaml index e742f79c9e..ecf288fe92 100644 --- a/e2e-tests/tests/scheduled-backup/03-read-from-primary.yaml +++ b/e2e-tests/tests/scheduled-backup/03-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass scheduled-backup-pguser-postgres)@$(get_psql_user_host scheduled-backup-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 03-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/scheduled-backup/04-engage-repo1.yaml b/e2e-tests/tests/scheduled-backup/04-engage-repo1.yaml index 0e48ac6aa9..5768cc2d5f 100644 --- a/e2e-tests/tests/scheduled-backup/04-engage-repo1.yaml +++ b/e2e-tests/tests/scheduled-backup/04-engage-repo1.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: | patch=$( @@ -21,3 +20,4 @@ commands: -n "$NAMESPACE" \ --type=json \ -p "$patch" + timeout: 30 diff --git a/e2e-tests/tests/scheduled-backup/06-engage-repo2.yaml b/e2e-tests/tests/scheduled-backup/06-engage-repo2.yaml index d18ee73eda..1375e2f55c 100644 --- a/e2e-tests/tests/scheduled-backup/06-engage-repo2.yaml +++ b/e2e-tests/tests/scheduled-backup/06-engage-repo2.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: | patch=$( @@ -25,3 +24,4 @@ commands: -n "$NAMESPACE" \ --type=json \ -p "$patch" + timeout: 30 diff --git a/e2e-tests/tests/scheduled-backup/08-engage-repo3.yaml b/e2e-tests/tests/scheduled-backup/08-engage-repo3.yaml index c6771db2e4..a0c5ab94c7 100644 --- a/e2e-tests/tests/scheduled-backup/08-engage-repo3.yaml +++ b/e2e-tests/tests/scheduled-backup/08-engage-repo3.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: | patch=$( @@ -25,3 +24,4 @@ commands: -n "$NAMESPACE" \ --type=json \ -p "$patch" + timeout: 30 diff --git a/e2e-tests/tests/scheduled-backup/09-disable-schedule.yaml b/e2e-tests/tests/scheduled-backup/09-disable-schedule.yaml index 84870675d2..71f566f5d9 100644 --- a/e2e-tests/tests/scheduled-backup/09-disable-schedule.yaml +++ b/e2e-tests/tests/scheduled-backup/09-disable-schedule.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: | patch=$( @@ -20,3 +19,4 @@ commands: -n "$NAMESPACE" \ --type=json \ -p "$patch" + timeout: 30 diff --git a/e2e-tests/tests/scheduled-backup/12-verify-restored-data.yaml b/e2e-tests/tests/scheduled-backup/12-verify-restored-data.yaml index 00e4b4b52c..12194b82d4 100644 --- a/e2e-tests/tests/scheduled-backup/12-verify-restored-data.yaml +++ b/e2e-tests/tests/scheduled-backup/12-verify-restored-data.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass scheduled-backup-pguser-postgres)@$(get_psql_user_host scheduled-backup-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 11-verify-restored-data --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/scheduled-backup/15-verify-restored-data.yaml b/e2e-tests/tests/scheduled-backup/15-verify-restored-data.yaml index ed2a32b3f8..af09be3723 100644 --- a/e2e-tests/tests/scheduled-backup/15-verify-restored-data.yaml +++ b/e2e-tests/tests/scheduled-backup/15-verify-restored-data.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass scheduled-backup-pguser-postgres)@$(get_psql_user_host scheduled-backup-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 14-verify-restored-data --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/scheduled-backup/18-verify-restored-data.yaml b/e2e-tests/tests/scheduled-backup/18-verify-restored-data.yaml index 273a4e797d..e387ea7b7c 100644 --- a/e2e-tests/tests/scheduled-backup/18-verify-restored-data.yaml +++ b/e2e-tests/tests/scheduled-backup/18-verify-restored-data.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass scheduled-backup-pguser-postgres)@$(get_psql_user_host scheduled-backup-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 17-verify-restored-data --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/scheduled-backup/19-check-pgbackup-job.yaml b/e2e-tests/tests/scheduled-backup/19-check-pgbackup-job.yaml index 4595f18cb5..1145b502cd 100644 --- a/e2e-tests/tests/scheduled-backup/19-check-pgbackup-job.yaml +++ b/e2e-tests/tests/scheduled-backup/19-check-pgbackup-job.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -22,3 +21,4 @@ commands: echo "ERROR: succeeded pg-backups != succeeded jobs" exit 1 fi + timeout: 30 diff --git a/e2e-tests/tests/self-healing/00-deploy-operator.yaml b/e2e-tests/tests/self-healing/00-deploy-operator.yaml index 1aaca58be2..77cab8c26f 100644 --- a/e2e-tests/tests/self-healing/00-deploy-operator.yaml +++ b/e2e-tests/tests/self-healing/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: deploy_operator deploy_client + timeout: 10 diff --git a/e2e-tests/tests/self-healing/01-deploy-chaos-mesh.yaml b/e2e-tests/tests/self-healing/01-deploy-chaos-mesh.yaml index 2fcde50277..435ce92e5d 100644 --- a/e2e-tests/tests/self-healing/01-deploy-chaos-mesh.yaml +++ b/e2e-tests/tests/self-healing/01-deploy-chaos-mesh.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -9,3 +8,4 @@ commands: source ../../functions deploy_chaos_mesh + timeout: 10 diff --git a/e2e-tests/tests/self-healing/02-create-cluster.yaml b/e2e-tests/tests/self-healing/02-create-cluster.yaml index abe1d5a61a..3d84380333 100644 --- a/e2e-tests/tests/self-healing/02-create-cluster.yaml +++ b/e2e-tests/tests/self-healing/02-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -9,3 +8,4 @@ commands: source ../../functions get_cr | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/self-healing/04-read-from-primary.yaml b/e2e-tests/tests/self-healing/04-read-from-primary.yaml index 189c201412..a7d7172ec3 100644 --- a/e2e-tests/tests/self-healing/04-read-from-primary.yaml +++ b/e2e-tests/tests/self-healing/04-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -10,3 +9,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass self-healing-pguser-postgres)@$(get_psql_user_host self-healing-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 04-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/self-healing/05-kill-master.yaml b/e2e-tests/tests/self-healing/05-kill-master.yaml index 2cfbf56cf0..de3e6fb60b 100644 --- a/e2e-tests/tests/self-healing/05-kill-master.yaml +++ b/e2e-tests/tests/self-healing/05-kill-master.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -10,3 +9,4 @@ commands: kill_pods "${NAMESPACE}" "pod" "$init_pod" sleep 10 # wait a bit for pod to be killed + timeout: 30 diff --git a/e2e-tests/tests/self-healing/07-read-from-all-pods.yaml b/e2e-tests/tests/self-healing/07-read-from-all-pods.yaml index 92f54f5552..cbc1beb23f 100644 --- a/e2e-tests/tests/self-healing/07-read-from-all-pods.yaml +++ b/e2e-tests/tests/self-healing/07-read-from-all-pods.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o xtrace diff --git a/e2e-tests/tests/self-healing/08-failure-master.yaml b/e2e-tests/tests/self-healing/08-failure-master.yaml index 300c79e28b..664715c5ab 100644 --- a/e2e-tests/tests/self-healing/08-failure-master.yaml +++ b/e2e-tests/tests/self-healing/08-failure-master.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -16,3 +15,4 @@ commands: echo "master pod was not killed! something went wrong." exit 1 fi + timeout: 30 diff --git a/e2e-tests/tests/self-healing/10-read-from-all-pods.yaml b/e2e-tests/tests/self-healing/10-read-from-all-pods.yaml index 7056435ad3..6132285e45 100644 --- a/e2e-tests/tests/self-healing/10-read-from-all-pods.yaml +++ b/e2e-tests/tests/self-healing/10-read-from-all-pods.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o xtrace diff --git a/e2e-tests/tests/self-healing/11-network-loss-master.yaml b/e2e-tests/tests/self-healing/11-network-loss-master.yaml index 012a2ab051..a0f00aa33b 100644 --- a/e2e-tests/tests/self-healing/11-network-loss-master.yaml +++ b/e2e-tests/tests/self-healing/11-network-loss-master.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 90 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: network_loss "${NAMESPACE}" "$(get_pod_by_role self-healing primary name)" sleep 40 # wait for new master to get elected timeout: 90 + timeout: 90 diff --git a/e2e-tests/tests/self-healing/13-read-from-all-pods.yaml b/e2e-tests/tests/self-healing/13-read-from-all-pods.yaml index f0eedc7330..5c0b9d6c11 100644 --- a/e2e-tests/tests/self-healing/13-read-from-all-pods.yaml +++ b/e2e-tests/tests/self-healing/13-read-from-all-pods.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o xtrace diff --git a/e2e-tests/tests/self-healing/14-cluster-crash.yaml b/e2e-tests/tests/self-healing/14-cluster-crash.yaml index 574bff19af..a6d43eed3f 100644 --- a/e2e-tests/tests/self-healing/14-cluster-crash.yaml +++ b/e2e-tests/tests/self-healing/14-cluster-crash.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -10,3 +9,4 @@ commands: kill_pods "${NAMESPACE}" "label" "postgres-operator.crunchydata.com/cluster" "self-healing" sleep 30 # wait for crash + timeout: 30 diff --git a/e2e-tests/tests/self-healing/16-read-from-all-pods.yaml b/e2e-tests/tests/self-healing/16-read-from-all-pods.yaml index e95754882d..6af74db7b9 100644 --- a/e2e-tests/tests/self-healing/16-read-from-all-pods.yaml +++ b/e2e-tests/tests/self-healing/16-read-from-all-pods.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o xtrace diff --git a/e2e-tests/tests/self-healing/98-destroy-chaos-mesh.yaml b/e2e-tests/tests/self-healing/98-destroy-chaos-mesh.yaml index 3f0cbc6b8e..bfc7f32499 100644 --- a/e2e-tests/tests/self-healing/98-destroy-chaos-mesh.yaml +++ b/e2e-tests/tests/self-healing/98-destroy-chaos-mesh.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 120 commands: - script: |- set -o errexit @@ -10,3 +9,4 @@ commands: destroy_chaos_mesh timeout: 120 + timeout: 120 diff --git a/e2e-tests/tests/sidecars/00-deploy-operator.yaml b/e2e-tests/tests/sidecars/00-deploy-operator.yaml index 544ecbeb95..e2aeeaca32 100644 --- a/e2e-tests/tests/sidecars/00-deploy-operator.yaml +++ b/e2e-tests/tests/sidecars/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit diff --git a/e2e-tests/tests/sidecars/01-create-cluster.yaml b/e2e-tests/tests/sidecars/01-create-cluster.yaml index ac7edd935d..22cd88cd01 100644 --- a/e2e-tests/tests/sidecars/01-create-cluster.yaml +++ b/e2e-tests/tests/sidecars/01-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 20 commands: - script: |- set -o errexit @@ -21,5 +20,4 @@ commands: | yq eval '.spec.backups.pgbackrest.repoHost.sidecarPVCs = [{"name": "sidecar-repohost-claim", "spec": {"resources": {"requests": {"storage": "1Gi"}}, "volumeMode": "Filesystem", "accessModes": ["ReadWriteOnce"]}}]' - \ | kubectl -n "${NAMESPACE}" apply -f - timeout: 30 - - + timeout: 20 diff --git a/e2e-tests/tests/standby-pgbackrest/00-deploy-operator.yaml b/e2e-tests/tests/standby-pgbackrest/00-deploy-operator.yaml index ac7a1b3abe..044b79d188 100644 --- a/e2e-tests/tests/standby-pgbackrest/00-deploy-operator.yaml +++ b/e2e-tests/tests/standby-pgbackrest/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: deploy_operator deploy_s3_secrets + timeout: 10 diff --git a/e2e-tests/tests/standby-pgbackrest/01-create-source-cluster.yaml b/e2e-tests/tests/standby-pgbackrest/01-create-source-cluster.yaml index f3b017e445..0d11395ee3 100644 --- a/e2e-tests/tests/standby-pgbackrest/01-create-source-cluster.yaml +++ b/e2e-tests/tests/standby-pgbackrest/01-create-source-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 20 commands: - script: |- set -o errexit @@ -9,3 +8,4 @@ commands: source ../../functions get_cr "source-cluster" ${RANDOM} | kubectl -n "${NAMESPACE}" apply -f - + timeout: 20 diff --git a/e2e-tests/tests/standby-pgbackrest/02-create-standby-cluster.yaml b/e2e-tests/tests/standby-pgbackrest/02-create-standby-cluster.yaml index 62cec54d46..305e9c0f8b 100644 --- a/e2e-tests/tests/standby-pgbackrest/02-create-standby-cluster.yaml +++ b/e2e-tests/tests/standby-pgbackrest/02-create-standby-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 20 commands: - script: |- set -o errexit @@ -15,4 +14,5 @@ commands: | yq eval '.spec.standby.enabled = true' - \ | yq eval '.spec.standby.repoName = "repo1"' - \ | yq eval '.spec.standby.maxAcceptableLag = "1Ki"' - \ - | kubectl -n "${NAMESPACE}" apply -f - \ No newline at end of file + | kubectl -n "${NAMESPACE}" apply -f - + timeout: 20 diff --git a/e2e-tests/tests/standby-pgbackrest/03-standby-lockdown.yaml b/e2e-tests/tests/standby-pgbackrest/03-standby-lockdown.yaml index 46513cfe96..c835900d9e 100644 --- a/e2e-tests/tests/standby-pgbackrest/03-standby-lockdown.yaml +++ b/e2e-tests/tests/standby-pgbackrest/03-standby-lockdown.yaml @@ -1,7 +1,6 @@ # To simulate broken replication, we will block the standby primary from accessing the S3 bucket. apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 20 commands: - script: |- set -o errexit @@ -20,3 +19,4 @@ commands: kubectl exec -n "${NAMESPACE}" "${standby_primary}" -c netshoot -- sh -c \ "iptables -A OUTPUT -p tcp -m string --string \"$endpoint\" --algo bm -j DROP" + timeout: 20 diff --git a/e2e-tests/tests/standby-pgbackrest/04-generate-data.yaml b/e2e-tests/tests/standby-pgbackrest/04-generate-data.yaml index dec668be84..fdd1e6eb60 100644 --- a/e2e-tests/tests/standby-pgbackrest/04-generate-data.yaml +++ b/e2e-tests/tests/standby-pgbackrest/04-generate-data.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 20 commands: - script: |- set -o errexit @@ -15,3 +14,4 @@ commands: fi kubectl exec -n "${NAMESPACE}" "${main_primary}" -c database -- sh -c 'pgbench -i -s 20 postgres' + timeout: 20 diff --git a/e2e-tests/tests/standby-pgbackrest/05-standby-remove-lockdown.yaml b/e2e-tests/tests/standby-pgbackrest/05-standby-remove-lockdown.yaml index 2621c0d633..a2e63ebce5 100644 --- a/e2e-tests/tests/standby-pgbackrest/05-standby-remove-lockdown.yaml +++ b/e2e-tests/tests/standby-pgbackrest/05-standby-remove-lockdown.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 20 commands: - script: |- set -o errexit @@ -14,4 +13,5 @@ commands: exit 1 fi - kubectl exec -n "${NAMESPACE}" "${standby_primary}" -c netshoot -- sh -c 'iptables -F OUTPUT' \ No newline at end of file + kubectl exec -n "${NAMESPACE}" "${standby_primary}" -c netshoot -- sh -c 'iptables -F OUTPUT' + timeout: 20 diff --git a/e2e-tests/tests/standby-pgbackrest/99-cleanup.yaml b/e2e-tests/tests/standby-pgbackrest/99-cleanup.yaml index 67df2f980c..bb95bca43d 100644 --- a/e2e-tests/tests/standby-pgbackrest/99-cleanup.yaml +++ b/e2e-tests/tests/standby-pgbackrest/99-cleanup.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 300 delete: - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster @@ -27,3 +26,4 @@ commands: check_operator_panic destroy_operator timeout: 60 + timeout: 300 diff --git a/e2e-tests/tests/standby-streaming/00-deploy-operator.yaml b/e2e-tests/tests/standby-streaming/00-deploy-operator.yaml index ac7a1b3abe..044b79d188 100644 --- a/e2e-tests/tests/standby-streaming/00-deploy-operator.yaml +++ b/e2e-tests/tests/standby-streaming/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: deploy_operator deploy_s3_secrets + timeout: 10 diff --git a/e2e-tests/tests/standby-streaming/01-create-source-cluster.yaml b/e2e-tests/tests/standby-streaming/01-create-source-cluster.yaml index f3b017e445..0d11395ee3 100644 --- a/e2e-tests/tests/standby-streaming/01-create-source-cluster.yaml +++ b/e2e-tests/tests/standby-streaming/01-create-source-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 20 commands: - script: |- set -o errexit @@ -9,3 +8,4 @@ commands: source ../../functions get_cr "source-cluster" ${RANDOM} | kubectl -n "${NAMESPACE}" apply -f - + timeout: 20 diff --git a/e2e-tests/tests/standby-streaming/02-create-standby-cluster.yaml b/e2e-tests/tests/standby-streaming/02-create-standby-cluster.yaml index c306b65cc1..8bf1855d88 100644 --- a/e2e-tests/tests/standby-streaming/02-create-standby-cluster.yaml +++ b/e2e-tests/tests/standby-streaming/02-create-standby-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 20 commands: - script: |- set -o errexit @@ -17,4 +16,5 @@ commands: | yq eval '.spec.standby.maxAcceptableLag = "1Ki"' - \ | yq eval '.spec.secrets.customTLSSecret.name = "source-cluster-cluster-cert"' - \ | yq eval '.spec.secrets.customReplicationTLSSecret.name = "source-cluster-replication-cert"' - \ - | kubectl -n "${NAMESPACE}" apply -f - \ No newline at end of file + | kubectl -n "${NAMESPACE}" apply -f - + timeout: 20 diff --git a/e2e-tests/tests/standby-streaming/03-standby-lockdown.yaml b/e2e-tests/tests/standby-streaming/03-standby-lockdown.yaml index ebdc2a328a..a0a242ba0e 100644 --- a/e2e-tests/tests/standby-streaming/03-standby-lockdown.yaml +++ b/e2e-tests/tests/standby-streaming/03-standby-lockdown.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 20 commands: - script: |- set -o errexit @@ -19,4 +18,5 @@ commands: # Rate limit the standby network traffic so that replication is slow. This will lead to lag. source_cluster_ip=$(kubectl get svc -n "${NAMESPACE}" source-cluster-ha -o jsonpath='{.spec.clusterIP}') kubectl exec -n "${NAMESPACE}" "${standby_primary}" -c netshoot -- sh -c "iptables -A OUTPUT -p tcp -d ${source_cluster_ip} --dport 5432 -m limit --limit 1/s --limit-burst 1 -j ACCEPT" - kubectl exec -n "${NAMESPACE}" "${standby_primary}" -c netshoot -- sh -c "iptables -A OUTPUT -p tcp -d ${source_cluster_ip} --dport 5432 -j DROP" \ No newline at end of file + kubectl exec -n "${NAMESPACE}" "${standby_primary}" -c netshoot -- sh -c "iptables -A OUTPUT -p tcp -d ${source_cluster_ip} --dport 5432 -j DROP" + timeout: 20 diff --git a/e2e-tests/tests/standby-streaming/04-generate-data.yaml b/e2e-tests/tests/standby-streaming/04-generate-data.yaml index dec668be84..fdd1e6eb60 100644 --- a/e2e-tests/tests/standby-streaming/04-generate-data.yaml +++ b/e2e-tests/tests/standby-streaming/04-generate-data.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 20 commands: - script: |- set -o errexit @@ -15,3 +14,4 @@ commands: fi kubectl exec -n "${NAMESPACE}" "${main_primary}" -c database -- sh -c 'pgbench -i -s 20 postgres' + timeout: 20 diff --git a/e2e-tests/tests/standby-streaming/05-standby-remove-lockdown.yaml b/e2e-tests/tests/standby-streaming/05-standby-remove-lockdown.yaml index 2621c0d633..a2e63ebce5 100644 --- a/e2e-tests/tests/standby-streaming/05-standby-remove-lockdown.yaml +++ b/e2e-tests/tests/standby-streaming/05-standby-remove-lockdown.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 20 commands: - script: |- set -o errexit @@ -14,4 +13,5 @@ commands: exit 1 fi - kubectl exec -n "${NAMESPACE}" "${standby_primary}" -c netshoot -- sh -c 'iptables -F OUTPUT' \ No newline at end of file + kubectl exec -n "${NAMESPACE}" "${standby_primary}" -c netshoot -- sh -c 'iptables -F OUTPUT' + timeout: 20 diff --git a/e2e-tests/tests/standby-streaming/99-cleanup.yaml b/e2e-tests/tests/standby-streaming/99-cleanup.yaml index 67df2f980c..bb95bca43d 100644 --- a/e2e-tests/tests/standby-streaming/99-cleanup.yaml +++ b/e2e-tests/tests/standby-streaming/99-cleanup.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 300 delete: - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster @@ -27,3 +26,4 @@ commands: check_operator_panic destroy_operator timeout: 60 + timeout: 300 diff --git a/e2e-tests/tests/start-from-backup/00-deploy-operator.yaml b/e2e-tests/tests/start-from-backup/00-deploy-operator.yaml index 7faf4da852..b64878610d 100644 --- a/e2e-tests/tests/start-from-backup/00-deploy-operator.yaml +++ b/e2e-tests/tests/start-from-backup/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -12,3 +11,4 @@ commands: deploy_operator deploy_client deploy_s3_secrets + timeout: 10 diff --git a/e2e-tests/tests/start-from-backup/01-create-source-cluster.yaml b/e2e-tests/tests/start-from-backup/01-create-source-cluster.yaml index 422b246fa4..f0fcaadece 100644 --- a/e2e-tests/tests/start-from-backup/01-create-source-cluster.yaml +++ b/e2e-tests/tests/start-from-backup/01-create-source-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 20 commands: - script: |- set -o errexit @@ -10,4 +9,5 @@ commands: get_cr "start-from-backup-source" ${RANDOM} \ | kubectl -n "${NAMESPACE}" apply -f - - \ No newline at end of file + timeout: 20 + diff --git a/e2e-tests/tests/start-from-backup/03-read-from-primary.yaml b/e2e-tests/tests/start-from-backup/03-read-from-primary.yaml index 3f270a8554..88d20fdf50 100644 --- a/e2e-tests/tests/start-from-backup/03-read-from-primary.yaml +++ b/e2e-tests/tests/start-from-backup/03-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass start-from-backup-source-pguser-postgres)@$(get_psql_user_host start-from-backup-source-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 03-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/start-from-backup/06-create-cluster.yaml b/e2e-tests/tests/start-from-backup/06-create-cluster.yaml index eeaba2a506..165ec89d6e 100644 --- a/e2e-tests/tests/start-from-backup/06-create-cluster.yaml +++ b/e2e-tests/tests/start-from-backup/06-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -9,3 +8,4 @@ commands: source ../../functions destination=$(kubectl get perconapgbackup -n "${NAMESPACE}" start-from-backup-source-full-repo1 -o jsonpath='{.status.destination}' | sed "s|^s3://$BUCKET||g") get_cr "start-from-backup" ${RANDOM} ${destination} | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/start-from-backup/07-read-from-primary.yaml b/e2e-tests/tests/start-from-backup/07-read-from-primary.yaml index 6e9d008622..79a5911090 100644 --- a/e2e-tests/tests/start-from-backup/07-read-from-primary.yaml +++ b/e2e-tests/tests/start-from-backup/07-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 60 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass start-from-backup-pguser-postgres)@$(get_psql_user_host start-from-backup-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 07-read-from-primary --from-literal=data="${data}" + timeout: 60 diff --git a/e2e-tests/tests/tablespaces/00-deploy-operator.yaml b/e2e-tests/tests/tablespaces/00-deploy-operator.yaml index 7faf4da852..b64878610d 100644 --- a/e2e-tests/tests/tablespaces/00-deploy-operator.yaml +++ b/e2e-tests/tests/tablespaces/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -12,3 +11,4 @@ commands: deploy_operator deploy_client deploy_s3_secrets + timeout: 10 diff --git a/e2e-tests/tests/tablespaces/01-create-cluster.yaml b/e2e-tests/tests/tablespaces/01-create-cluster.yaml index 9ea11fb964..44c0b162ac 100644 --- a/e2e-tests/tests/tablespaces/01-create-cluster.yaml +++ b/e2e-tests/tests/tablespaces/01-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -14,3 +13,4 @@ commands: .spec.instances[].tablespaceVolumes[0].dataVolumeClaimSpec.accessModes[0]="ReadWriteOnce" | .spec.instances[].tablespaceVolumes[0].dataVolumeClaimSpec.resources.requests.storage="1Gi"' - \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/tablespaces/02-verify-tablespace-volume.yaml b/e2e-tests/tests/tablespaces/02-verify-tablespace-volume.yaml index c5b65ab88c..5aa7fb1b1c 100644 --- a/e2e-tests/tests/tablespaces/02-verify-tablespace-volume.yaml +++ b/e2e-tests/tests/tablespaces/02-verify-tablespace-volume.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -15,3 +14,4 @@ commands: kubectl create configmap -n "${NAMESPACE}" 02-ts-path-${i} --from-literal=path="/tablespaces/${path}" i=$((i+1)) done + timeout: 30 diff --git a/e2e-tests/tests/tablespaces/04-read-from-primary.yaml b/e2e-tests/tests/tablespaces/04-read-from-primary.yaml index 20677b0cb6..43962a712a 100644 --- a/e2e-tests/tests/tablespaces/04-read-from-primary.yaml +++ b/e2e-tests/tests/tablespaces/04-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -20,3 +19,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass tablespaces-pguser-postgres)@$(get_psql_user_host tablespaces-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 04-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/tablespaces/09-verify-restored-data.yaml b/e2e-tests/tests/tablespaces/09-verify-restored-data.yaml index a281722c21..a0bf4b2e94 100644 --- a/e2e-tests/tests/tablespaces/09-verify-restored-data.yaml +++ b/e2e-tests/tests/tablespaces/09-verify-restored-data.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -20,4 +19,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass tablespaces-pguser-postgres)@$(get_psql_user_host tablespaces-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 09-verify-restored-data --from-literal=data="${data}" - + timeout: 30 diff --git a/e2e-tests/tests/telemetry-transfer/00-deploy-version-service.yaml b/e2e-tests/tests/telemetry-transfer/00-deploy-version-service.yaml index 46bfb1deb1..bc56cde865 100644 --- a/e2e-tests/tests/telemetry-transfer/00-deploy-version-service.yaml +++ b/e2e-tests/tests/telemetry-transfer/00-deploy-version-service.yaml @@ -1,7 +1,6 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -13,6 +12,7 @@ commands: kubectl -n ${NAMESPACE} create configmap versions \ --from-file "${TESTS_CONFIG_DIR}/operator.9.9.9.pg-operator.dep.json" \ --from-file "${TESTS_CONFIG_DIR}/operator.9.9.9.pg-operator.json" + timeout: 10 --- apiVersion: apps/v1 kind: Deployment diff --git a/e2e-tests/tests/telemetry-transfer/01-deploy-operator.yaml b/e2e-tests/tests/telemetry-transfer/01-deploy-operator.yaml index 8856dfb704..7979a094f8 100644 --- a/e2e-tests/tests/telemetry-transfer/01-deploy-operator.yaml +++ b/e2e-tests/tests/telemetry-transfer/01-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -10,4 +9,5 @@ commands: deploy_operator deploy_client kubectl -n ${OPERATOR_NS:-$NAMESPACE} set env deploy/percona-postgresql-operator PERCONA_VS_FALLBACK_URI="http://$(get_service_ip version-service):11000" - kubectl -n ${OPERATOR_NS:-$NAMESPACE} patch deploy/percona-postgresql-operator --patch '{"metadata":{"labels": {"helm.sh/chart": "fake-operator-chart"}}}' \ No newline at end of file + kubectl -n ${OPERATOR_NS:-$NAMESPACE} patch deploy/percona-postgresql-operator --patch '{"metadata":{"labels": {"helm.sh/chart": "fake-operator-chart"}}}' + timeout: 10 diff --git a/e2e-tests/tests/telemetry-transfer/02-create-cluster.yaml b/e2e-tests/tests/telemetry-transfer/02-create-cluster.yaml index c3b9814f8a..d6684f622b 100644 --- a/e2e-tests/tests/telemetry-transfer/02-create-cluster.yaml +++ b/e2e-tests/tests/telemetry-transfer/02-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -10,3 +9,4 @@ commands: get_cr \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/telemetry-transfer/03-verify-transferred-default.yaml b/e2e-tests/tests/telemetry-transfer/03-verify-transferred-default.yaml index aee873a9ee..98c546690f 100644 --- a/e2e-tests/tests/telemetry-transfer/03-verify-transferred-default.yaml +++ b/e2e-tests/tests/telemetry-transfer/03-verify-transferred-default.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: CR_ID=$(kubectl -n ${NAMESPACE} get perconapgcluster/${test_name} --template='{{.metadata.uid}}') TRANSFERRED_KEYS=$(kubectl -n ${NAMESPACE} logs -l run=version-service| grep ${CR_ID} | tail -n1 | grep -Eo '\{.*\}$' | jq '."grpc.request.content".msg | keys') kubectl create configmap -n "${NAMESPACE}" 03-verify-transferred-keys --from-literal=keys="${TRANSFERRED_KEYS}" + timeout: 10 diff --git a/e2e-tests/tests/telemetry-transfer/04-verify-transferred-pmm.yaml b/e2e-tests/tests/telemetry-transfer/04-verify-transferred-pmm.yaml index 75f10545b0..05d489e91f 100644 --- a/e2e-tests/tests/telemetry-transfer/04-verify-transferred-pmm.yaml +++ b/e2e-tests/tests/telemetry-transfer/04-verify-transferred-pmm.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -12,4 +11,5 @@ commands: sleep 7 CR_ID=$(kubectl -n ${NAMESPACE} get perconapgcluster/${test_name} --template='{{.metadata.uid}}') TRANSFERRED_KEYS=$(kubectl -n ${NAMESPACE} logs -l run=version-service| grep ${CR_ID} | tail -n1 | grep -Eo '\{.*\}$' | jq '."grpc.request.content".msg | keys') - kubectl create configmap -n "${NAMESPACE}" 04-verify-tramsferred-pmm --from-literal=keys="${TRANSFERRED_KEYS}" \ No newline at end of file + kubectl create configmap -n "${NAMESPACE}" 04-verify-tramsferred-pmm --from-literal=keys="${TRANSFERRED_KEYS}" + timeout: 10 diff --git a/e2e-tests/tests/telemetry-transfer/05-verify-transferred-helm-cr.yaml b/e2e-tests/tests/telemetry-transfer/05-verify-transferred-helm-cr.yaml index 736809a7da..719ea7d5c0 100644 --- a/e2e-tests/tests/telemetry-transfer/05-verify-transferred-helm-cr.yaml +++ b/e2e-tests/tests/telemetry-transfer/05-verify-transferred-helm-cr.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -12,4 +11,5 @@ commands: sleep 7 CR_ID=$(kubectl -n ${NAMESPACE} get perconapgcluster/${test_name} --template='{{.metadata.uid}}') TRANSFERRED_KEYS=$(kubectl -n ${NAMESPACE} logs -l run=version-service| grep ${CR_ID} | tail -n1 | grep -Eo '\{.*\}$' | jq '."grpc.request.content".msg | keys') - kubectl create configmap -n "${NAMESPACE}" 05-verify-tramsferred-helm-cr --from-literal=keys="${TRANSFERRED_KEYS}" \ No newline at end of file + kubectl create configmap -n "${NAMESPACE}" 05-verify-tramsferred-helm-cr --from-literal=keys="${TRANSFERRED_KEYS}" + timeout: 10 diff --git a/e2e-tests/tests/telemetry-transfer/06-verify-transferred-sidecars.yaml b/e2e-tests/tests/telemetry-transfer/06-verify-transferred-sidecars.yaml index 8aeec9f576..a73c33b7de 100644 --- a/e2e-tests/tests/telemetry-transfer/06-verify-transferred-sidecars.yaml +++ b/e2e-tests/tests/telemetry-transfer/06-verify-transferred-sidecars.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -12,4 +11,5 @@ commands: sleep 7 CR_ID=$(kubectl -n ${NAMESPACE} get perconapgcluster/${test_name} --template='{{.metadata.uid}}') TRANSFERRED_KEYS=$(kubectl -n ${NAMESPACE} logs -l run=version-service| grep ${CR_ID} | tail -n1 | grep -Eo '\{.*\}$' | jq '."grpc.request.content".msg | keys') - kubectl create configmap -n "${NAMESPACE}" 06-verify-tramsferred-sidecars --from-literal=keys="${TRANSFERRED_KEYS}" \ No newline at end of file + kubectl create configmap -n "${NAMESPACE}" 06-verify-tramsferred-sidecars --from-literal=keys="${TRANSFERRED_KEYS}" + timeout: 10 diff --git a/e2e-tests/tests/upgrade-consistency/00-deploy-operator.yaml b/e2e-tests/tests/upgrade-consistency/00-deploy-operator.yaml index bcdb235dc7..847c6ebe6c 100644 --- a/e2e-tests/tests/upgrade-consistency/00-deploy-operator.yaml +++ b/e2e-tests/tests/upgrade-consistency/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -10,3 +9,4 @@ commands: init_temp_dir # do this only in the first TestStep deploy_operator + timeout: 10 diff --git a/e2e-tests/tests/upgrade-consistency/01-create-cluster.yaml b/e2e-tests/tests/upgrade-consistency/01-create-cluster.yaml index 68577d8b6d..e5a9a9b001 100644 --- a/e2e-tests/tests/upgrade-consistency/01-create-cluster.yaml +++ b/e2e-tests/tests/upgrade-consistency/01-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -12,3 +11,4 @@ commands: | yq eval ' .spec.crVersion="2.7.0"' - \ | kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/upgrade-consistency/02-patch-cluster.yaml b/e2e-tests/tests/upgrade-consistency/02-patch-cluster.yaml index bb49aec3f2..0c1939ccc1 100644 --- a/e2e-tests/tests/upgrade-consistency/02-patch-cluster.yaml +++ b/e2e-tests/tests/upgrade-consistency/02-patch-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -14,3 +13,4 @@ commands: | kubectl -n "${NAMESPACE}" apply -f - sleep 10 + timeout: 30 diff --git a/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml b/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml index 0c71840cba..decd57b52f 100644 --- a/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml +++ b/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -14,3 +13,4 @@ commands: | kubectl -n "${NAMESPACE}" apply -f - sleep 10 + timeout: 30 diff --git a/e2e-tests/tests/upgrade-minor/00-deploy-operator.yaml b/e2e-tests/tests/upgrade-minor/00-deploy-operator.yaml index f940fa77d9..dc3214a624 100644 --- a/e2e-tests/tests/upgrade-minor/00-deploy-operator.yaml +++ b/e2e-tests/tests/upgrade-minor/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -12,3 +11,4 @@ commands: git_tag="v$(curl -s https://check.percona.com/versions/v1/pg-operator | jq -r '.versions[].operator' | sort -V | tail -n1)" deploy_operator_gh $git_tag deploy_client + timeout: 10 diff --git a/e2e-tests/tests/upgrade-minor/01-create-cluster.yaml b/e2e-tests/tests/upgrade-minor/01-create-cluster.yaml index e7eb470636..fcfcb551be 100644 --- a/e2e-tests/tests/upgrade-minor/01-create-cluster.yaml +++ b/e2e-tests/tests/upgrade-minor/01-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 100 commands: - script: |- set -o errexit @@ -43,3 +42,4 @@ commands: .spec.users += [{"name":"postgres","password":{"type":"AlphaNumeric"}}] | .spec.users += [{"name":"'${test_name}'","password":{"type":"AlphaNumeric"}}]' "${TEMP_DIR}/cr_lower.yaml" kubectl -n "${NAMESPACE}" apply -f "${TEMP_DIR}/cr_lower.yaml" + timeout: 100 diff --git a/e2e-tests/tests/upgrade-minor/03-read-from-primary.yaml b/e2e-tests/tests/upgrade-minor/03-read-from-primary.yaml index e4030d011e..937189d257 100644 --- a/e2e-tests/tests/upgrade-minor/03-read-from-primary.yaml +++ b/e2e-tests/tests/upgrade-minor/03-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass upgrade-minor-pguser-postgres)@$(get_psql_user_host upgrade-minor-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 03-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/upgrade-minor/04-upgrade-operator.yaml b/e2e-tests/tests/upgrade-minor/04-upgrade-operator.yaml index 7d1a67b0e1..651035cf06 100644 --- a/e2e-tests/tests/upgrade-minor/04-upgrade-operator.yaml +++ b/e2e-tests/tests/upgrade-minor/04-upgrade-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -10,3 +9,4 @@ commands: update_operator kubectl wait -n ${OPERATOR_NS:-$NAMESPACE} --timeout 30s --for=jsonpath='{.spec.template.spec.containers[0].image}'=$IMAGE deployment/percona-postgresql-operator + timeout: 30 diff --git a/e2e-tests/tests/upgrade-minor/05-sleep-after-operator-update.yaml b/e2e-tests/tests/upgrade-minor/05-sleep-after-operator-update.yaml index 506a371d4e..9bbbefd42f 100644 --- a/e2e-tests/tests/upgrade-minor/05-sleep-after-operator-update.yaml +++ b/e2e-tests/tests/upgrade-minor/05-sleep-after-operator-update.yaml @@ -1,6 +1,6 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- sleep 30 + timeout: 30 diff --git a/e2e-tests/tests/upgrade-minor/08-read-from-primary.yaml b/e2e-tests/tests/upgrade-minor/08-read-from-primary.yaml index 17b6c261f4..ba79d653d3 100644 --- a/e2e-tests/tests/upgrade-minor/08-read-from-primary.yaml +++ b/e2e-tests/tests/upgrade-minor/08-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass upgrade-minor-pguser-postgres)@$(get_psql_user_host upgrade-minor-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 07-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/upgrade-minor/09-check-collation-mismatch.yaml b/e2e-tests/tests/upgrade-minor/09-check-collation-mismatch.yaml index b7c1803974..96dc99320b 100644 --- a/e2e-tests/tests/upgrade-minor/09-check-collation-mismatch.yaml +++ b/e2e-tests/tests/upgrade-minor/09-check-collation-mismatch.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit diff --git a/e2e-tests/tests/users/00-deploy-operator.yaml b/e2e-tests/tests/users/00-deploy-operator.yaml index 1aaca58be2..77cab8c26f 100644 --- a/e2e-tests/tests/users/00-deploy-operator.yaml +++ b/e2e-tests/tests/users/00-deploy-operator.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: deploy_operator deploy_client + timeout: 10 diff --git a/e2e-tests/tests/users/01-create-cluster.yaml b/e2e-tests/tests/users/01-create-cluster.yaml index a163ef09a4..8b20947e1d 100644 --- a/e2e-tests/tests/users/01-create-cluster.yaml +++ b/e2e-tests/tests/users/01-create-cluster.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -9,3 +8,4 @@ commands: source ../../functions get_cr "users" ${RANDOM}| kubectl -n "${NAMESPACE}" apply -f - + timeout: 10 diff --git a/e2e-tests/tests/users/03-read-from-primary.yaml b/e2e-tests/tests/users/03-read-from-primary.yaml index 1933d7b728..0c0af940ae 100644 --- a/e2e-tests/tests/users/03-read-from-primary.yaml +++ b/e2e-tests/tests/users/03-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -11,3 +10,4 @@ commands: data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass users-pguser-postgres)@$(get_psql_user_host users-pguser-postgres)") kubectl create configmap -n "${NAMESPACE}" 03-read-from-primary --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/users/04-update-default-user-password.yaml b/e2e-tests/tests/users/04-update-default-user-password.yaml index f4151f18dc..58f0185b03 100644 --- a/e2e-tests/tests/users/04-update-default-user-password.yaml +++ b/e2e-tests/tests/users/04-update-default-user-password.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -10,4 +9,5 @@ commands: kubectl -n ${NAMESPACE} patch secret users-pguser-postgres --type merge --patch '{"stringData": {"password": "default-db-password", "verifier":""}}' - sleep 5 \ No newline at end of file + sleep 5 + timeout: 10 diff --git a/e2e-tests/tests/users/06-read-from-primary.yaml b/e2e-tests/tests/users/06-read-from-primary.yaml index 8d050a7fa4..a941bdf165 100644 --- a/e2e-tests/tests/users/06-read-from-primary.yaml +++ b/e2e-tests/tests/users/06-read-from-primary.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -12,3 +11,4 @@ commands: kubectl create configmap -n "${NAMESPACE}" 06-read-from-primary --from-literal=data="${data}" kubectl get configmap -n "${NAMESPACE}" 06-read-from-primary -o yaml + timeout: 30 diff --git a/e2e-tests/tests/users/07-add-custom-user.yaml b/e2e-tests/tests/users/07-add-custom-user.yaml index 6bbfc20810..1d9d32e8cc 100644 --- a/e2e-tests/tests/users/07-add-custom-user.yaml +++ b/e2e-tests/tests/users/07-add-custom-user.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -10,3 +9,4 @@ commands: kubectl -n ${NAMESPACE} patch perconapgcluster/${test_name} --type=json -p '[{"op":"add", "path":"/spec/autoCreateUserSchema","value":true},{"op":"add", "path":"/spec/users","value":[{"name":"rhino","databases":["zoo"],"password":{"type":"ASCII"},"secretName":"rhino-credentials"}]}]' sleep 10 + timeout: 10 diff --git a/e2e-tests/tests/users/09-read-from-primary-custom-db.yaml b/e2e-tests/tests/users/09-read-from-primary-custom-db.yaml index 9ee89a304a..5ca3d26ec4 100644 --- a/e2e-tests/tests/users/09-read-from-primary-custom-db.yaml +++ b/e2e-tests/tests/users/09-read-from-primary-custom-db.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -17,3 +16,4 @@ commands: data=$(run_psql "SELECT * from $schema.customApp;" "-h $hostname -U $user -d $db_name" "$password") kubectl create configmap -n "${NAMESPACE}" 09-read-from-primary-custom-db --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/users/10-update-custom-user-password.yaml b/e2e-tests/tests/users/10-update-custom-user-password.yaml index 6e851933a4..76875b9df5 100644 --- a/e2e-tests/tests/users/10-update-custom-user-password.yaml +++ b/e2e-tests/tests/users/10-update-custom-user-password.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -10,3 +9,4 @@ commands: kubectl -n ${NAMESPACE} patch secret rhino-credentials --type merge --patch '{"stringData": {"password": "custom-db-password","verifier":""}}' sleep 5 + timeout: 10 diff --git a/e2e-tests/tests/users/12-read-from-primary-custom-db.yaml b/e2e-tests/tests/users/12-read-from-primary-custom-db.yaml index bfccdf36c6..f75bbdb850 100644 --- a/e2e-tests/tests/users/12-read-from-primary-custom-db.yaml +++ b/e2e-tests/tests/users/12-read-from-primary-custom-db.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -16,3 +15,4 @@ commands: data=$(run_psql "SELECT * from $schema.customApp;" "-h $hostname -U $user -d $db_name" "$password") kubectl create configmap -n "${NAMESPACE}" 12-read-from-primary-custom-db --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/users/13-add-custom-user-with-public-schema-access.yaml b/e2e-tests/tests/users/13-add-custom-user-with-public-schema-access.yaml index 7ad867dfc0..7b86b98e0f 100644 --- a/e2e-tests/tests/users/13-add-custom-user-with-public-schema-access.yaml +++ b/e2e-tests/tests/users/13-add-custom-user-with-public-schema-access.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -20,3 +19,4 @@ commands: kubectl -n ${NAMESPACE} patch perconapgcluster/${test_name} --type=json -p '[{"op":"add", "path":"/spec/autoCreateUserSchema","value":true},{"op":"add", "path":"/spec/users","value":[{"name":"chico","databases":["spain"],"password":{"type":"ASCII"},"secretName":"chico-credentials", "grantPublicSchemaAccess": true}]}]' sleep 10 fi + timeout: 10 diff --git a/e2e-tests/tests/users/15-read-from-primary-custom-db.yaml b/e2e-tests/tests/users/15-read-from-primary-custom-db.yaml index c30648c174..8fda6c853f 100644 --- a/e2e-tests/tests/users/15-read-from-primary-custom-db.yaml +++ b/e2e-tests/tests/users/15-read-from-primary-custom-db.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -21,3 +20,4 @@ commands: kubectl create configmap -n "${NAMESPACE}" 10-read-from-primary-custom-db --from-literal=data="${data}" fi + timeout: 30 diff --git a/e2e-tests/tests/users/16-create-user-with-predefined-password-secret.yaml b/e2e-tests/tests/users/16-create-user-with-predefined-password-secret.yaml index e487590b40..2deee0f736 100644 --- a/e2e-tests/tests/users/16-create-user-with-predefined-password-secret.yaml +++ b/e2e-tests/tests/users/16-create-user-with-predefined-password-secret.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -13,3 +12,4 @@ commands: kubectl -n ${NAMESPACE} patch perconapgcluster/${test_name} --type=json -p '[{"op":"add", "path":"/spec/autoCreateUserSchema","value":true},{"op":"add", "path":"/spec/users","value":[{"name":"eagle","databases":["nest"],"password":{"type":"ASCII"},"secretName":"eagle-credentials"}]}]' sleep 15 + timeout: 10 diff --git a/e2e-tests/tests/users/18-read-from-user-db-with-predefined-password.yaml b/e2e-tests/tests/users/18-read-from-user-db-with-predefined-password.yaml index a8151a972c..b039a29e6a 100644 --- a/e2e-tests/tests/users/18-read-from-user-db-with-predefined-password.yaml +++ b/e2e-tests/tests/users/18-read-from-user-db-with-predefined-password.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 30 commands: - script: |- set -o errexit @@ -17,3 +16,4 @@ commands: data=$(run_psql "SELECT * from $schema.customApp;" "-h $hostname -U $user -d $db_name" "$predefinedPassword") kubectl create configmap -n "${NAMESPACE}" 18-read-from-user-db-with-predefined-password --from-literal=data="${data}" + timeout: 30 diff --git a/e2e-tests/tests/users/19-reset-predefined-user-password.yaml b/e2e-tests/tests/users/19-reset-predefined-user-password.yaml index 4e58782368..d0896e0ef8 100644 --- a/e2e-tests/tests/users/19-reset-predefined-user-password.yaml +++ b/e2e-tests/tests/users/19-reset-predefined-user-password.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -10,4 +9,5 @@ commands: kubectl -n ${NAMESPACE} patch secret eagle-credentials --type merge --patch '{"stringData": {"password": "", "verifier":""}}' - sleep 5 \ No newline at end of file + sleep 5 + timeout: 10 diff --git a/e2e-tests/tests/users/21-set-again-user-with-predefined-password-secret.yaml b/e2e-tests/tests/users/21-set-again-user-with-predefined-password-secret.yaml index e12797c2fa..6c6082465b 100644 --- a/e2e-tests/tests/users/21-set-again-user-with-predefined-password-secret.yaml +++ b/e2e-tests/tests/users/21-set-again-user-with-predefined-password-secret.yaml @@ -1,6 +1,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 10 commands: - script: |- set -o errexit @@ -10,3 +9,4 @@ commands: kubectl -n ${NAMESPACE} patch secret eagle-credentials --type merge --patch '{"stringData": {"password": "eagle-db-password", "verifier":""}}' sleep 5 + timeout: 10