From db3a3b24a28c704db7a8f7974f7753d6c070400f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ege=20G=C3=BCne=C5=9F?= Date: Tue, 28 Apr 2026 14:21:34 +0300 Subject: [PATCH] e2e-tests: fix kuttl timeout placement in migration-data-volumes In the kuttl TestStep schema, `timeout` is a per-command field nested under `commands[]`; placed at the top level kuttl silently ignores it. Move the existing top-level `timeout` into the single command entry in each TestStep file so the configured timeout actually takes effect. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../tests/migration-data-volumes/00-start-v1-operator.yaml | 2 +- .../tests/migration-data-volumes/01-remove-v1-deployer.yaml | 2 +- .../tests/migration-data-volumes/02-start-v1-cluster.yaml | 2 +- .../tests/migration-data-volumes/04-read-from-primary.yaml | 2 +- .../tests/migration-data-volumes/05-deploy-operator.yaml | 4 ++-- .../tests/migration-data-volumes/10-read-from-primary.yaml | 2 +- .../tests/migration-data-volumes/12-read-from-primary.yaml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) 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..54c10b4fa1 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 \ No newline at end of file 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