Skip to content

Commit c367e5b

Browse files
committed
fix operator upgrade on cluster-wide
1 parent 76e650a commit c367e5b

File tree

5 files changed

+7
-54
lines changed

5 files changed

+7
-54
lines changed

e2e-tests/functions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -673,6 +673,7 @@ wait_cluster_consistency_gr() {
673673

674674
wait_pod() {
675675
local pod=$1
676+
local ns=${2:-${NAMESPACE}}
676677

677678
set +o xtrace
678679
retry=0

e2e-tests/tests/async-upgrade/02-assert.yaml

Lines changed: 0 additions & 26 deletions
This file was deleted.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
apiVersion: kuttl.dev/v1beta1
22
kind: TestStep
33
commands:
4-
- script: |-
4+
- timeout: 120
5+
script: |-
56
set -o errexit
67
set -o xtrace
78
89
source ../../functions
910
1011
upgrade_operator_image ${IMAGE}
12+
wait_deployment percona-server-mysql-operator ${OPERATOR_NS:-$NAMESPACE}

e2e-tests/tests/gr-upgrade/02-assert.yaml

Lines changed: 0 additions & 26 deletions
This file was deleted.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
apiVersion: kuttl.dev/v1beta1
22
kind: TestStep
33
commands:
4-
- script: |-
4+
- timeout: 120
5+
script: |-
56
set -o errexit
67
set -o xtrace
78
89
source ../../functions
910
1011
upgrade_operator_image ${IMAGE}
12+
wait_deployment percona-server-mysql-operator ${OPERATOR_NS:-$NAMESPACE}

0 commit comments

Comments
 (0)