Skip to content

Commit 56294d5

Browse files
authored
K8SPSMDB-1018 - Fix upgrade-consistency test to work with new image (#1412)
* K8SPSMDB-1018 - Fix upgrade-consistency test to work with new image * Address review comments, set initImage globally
1 parent ca70e0c commit 56294d5

9 files changed

+9
-6
lines changed

e2e-tests/functions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,6 +1040,7 @@ cat_config() {
10401040
cat "$1" \
10411041
| yq eval '(.spec | select(.image == null)).image = "'"$IMAGE_MONGOD"'"' \
10421042
| yq eval '(.spec | select(has("pmm"))).pmm.image = "'"$IMAGE_PMM_CLIENT"'"' \
1043+
| yq eval '(.spec | select(has("initImage"))).initImage = "'"$IMAGE"'"' \
10431044
| yq eval '(.spec | select(has("backup"))).backup.image = "'"$IMAGE_BACKUP"'"' \
10441045
| yq eval '.spec.upgradeOptions.apply="Never"'
10451046
}

e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-cfg-1160-oc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apps/v1
22
kind: StatefulSet
33
metadata:
44
annotations: {}
5-
generation: 3
5+
generation: 2
66
labels:
77
app.kubernetes.io/component: mongod
88
app.kubernetes.io/instance: some-name

e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-cfg-1160.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apps/v1
22
kind: StatefulSet
33
metadata:
44
annotations: {}
5-
generation: 3
5+
generation: 2
66
labels:
77
app.kubernetes.io/component: cfg
88
app.kubernetes.io/instance: some-name

e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-rs0-1160-oc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apps/v1
22
kind: StatefulSet
33
metadata:
44
annotations: {}
5-
generation: 3
5+
generation: 2
66
labels:
77
app.kubernetes.io/component: mongod
88
app.kubernetes.io/instance: some-name

e2e-tests/upgrade-consistency-sharded/compare/statefulset_some-name-rs0-1160.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apps/v1
22
kind: StatefulSet
33
metadata:
44
annotations: {}
5-
generation: 3
5+
generation: 2
66
labels:
77
app.kubernetes.io/component: mongod
88
app.kubernetes.io/instance: some-name

e2e-tests/upgrade-consistency-sharded/conf/some-name.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ spec:
1010
#platform: openshift
1111
image:
1212
imagePullPolicy: Always
13+
initImage: -init
1314
allowUnsafeConfigurations: false
1415
updateStrategy: SmartUpdate
1516
secrets:

e2e-tests/upgrade-consistency/compare/statefulset_some-name-rs0-1160-oc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apps/v1
22
kind: StatefulSet
33
metadata:
44
annotations: {}
5-
generation: 3
5+
generation: 2
66
labels:
77
app.kubernetes.io/component: mongod
88
app.kubernetes.io/instance: some-name

e2e-tests/upgrade-consistency/compare/statefulset_some-name-rs0-1160.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apps/v1
22
kind: StatefulSet
33
metadata:
44
annotations: {}
5-
generation: 3
5+
generation: 2
66
labels:
77
app.kubernetes.io/component: mongod
88
app.kubernetes.io/instance: some-name

e2e-tests/upgrade-consistency/conf/some-name-rs0.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ spec:
77
#platform: openshift
88
image:
99
imagePullPolicy: Always
10+
initImage: -init
1011
allowUnsafeConfigurations: false
1112
backup:
1213
enabled: false

0 commit comments

Comments
 (0)