Skip to content

Commit 5d322e3

Browse files
committed
fix tests
1 parent 52df399 commit 5d322e3

File tree

7 files changed

+20
-32
lines changed

7 files changed

+20
-32
lines changed

e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-tls-disabled-oc.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,6 @@ spec:
108108
- readiness
109109
- --component
110110
- mongod
111-
- --ssl
112-
- --sslInsecure
113-
- --sslCAFile
114-
- /etc/mongodb-ssl/ca.crt
115-
- --sslPEMKeyFile
116-
- /tmp/tls.pem
117111
failureThreshold: 3
118112
initialDelaySeconds: 10
119113
periodSeconds: 3

e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-cfg-tls-disabled.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,6 @@ spec:
108108
- readiness
109109
- --component
110110
- mongod
111-
- --ssl
112-
- --sslInsecure
113-
- --sslCAFile
114-
- /etc/mongodb-ssl/ca.crt
115-
- --sslPEMKeyFile
116-
- /tmp/tls.pem
117111
failureThreshold: 3
118112
initialDelaySeconds: 10
119113
periodSeconds: 3

e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-tls-disabled-oc.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,6 @@ spec:
9797
- readiness
9898
- --component
9999
- mongod
100-
- --ssl
101-
- --sslInsecure
102-
- --sslCAFile
103-
- /etc/mongodb-ssl/ca.crt
104-
- --sslPEMKeyFile
105-
- /tmp/tls.pem
106100
failureThreshold: 8
107101
initialDelaySeconds: 10
108102
periodSeconds: 3

e2e-tests/tls-issue-cert-manager/compare/statefulset_some-name-rs0-tls-disabled.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,6 @@ spec:
9797
- readiness
9898
- --component
9999
- mongod
100-
- --ssl
101-
- --sslInsecure
102-
- --sslCAFile
103-
- /etc/mongodb-ssl/ca.crt
104-
- --sslPEMKeyFile
105-
- /tmp/tls.pem
106100
failureThreshold: 8
107101
initialDelaySeconds: 10
108102
periodSeconds: 3

e2e-tests/upgrade-consistency-sharded-tls/run

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,20 +93,20 @@ main() {
9393
sleep 20
9494
desc 'check if Pod started'
9595
wait_cluster
96-
compare_generation "5" "statefulset" "${CLUSTER}-rs0"
97-
compare_generation "5" "statefulset" "${CLUSTER}-cfg"
96+
compare_generation "6" "statefulset" "${CLUSTER}-rs0"
97+
compare_generation "6" "statefulset" "${CLUSTER}-cfg"
9898

9999
renew_certificate "some-name-ssl"
100100
sleep 20
101101
wait_cluster
102-
compare_generation "6" "statefulset" "${CLUSTER}-rs0"
103-
compare_generation "6" "statefulset" "${CLUSTER}-cfg"
102+
compare_generation "7" "statefulset" "${CLUSTER}-rs0"
103+
compare_generation "7" "statefulset" "${CLUSTER}-cfg"
104104

105105
renew_certificate "some-name-ssl-internal"
106106
sleep 20
107107
wait_cluster
108-
compare_generation "7" "statefulset" "${CLUSTER}-rs0"
109-
compare_generation "7" "statefulset" "${CLUSTER}-cfg"
108+
compare_generation "8" "statefulset" "${CLUSTER}-rs0"
109+
compare_generation "8" "statefulset" "${CLUSTER}-cfg"
110110

111111
desc 'check if service and statefulset created with expected config'
112112
compare_kubectl service/${CLUSTER}-rs0 "-1210"

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

Lines changed: 7 additions & 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: 1
5+
generation: 2
66
labels:
77
app.kubernetes.io/component: mongod
88
app.kubernetes.io/instance: some-name
@@ -103,6 +103,12 @@ spec:
103103
- readiness
104104
- --component
105105
- mongod
106+
- --ssl
107+
- --sslInsecure
108+
- --sslCAFile
109+
- /etc/mongodb-ssl/ca.crt
110+
- --sslPEMKeyFile
111+
- /tmp/tls.pem
106112
failureThreshold: 8
107113
initialDelaySeconds: 10
108114
periodSeconds: 3

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

Lines changed: 7 additions & 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: 1
5+
generation: 2
66
labels:
77
app.kubernetes.io/component: mongod
88
app.kubernetes.io/instance: some-name
@@ -103,6 +103,12 @@ spec:
103103
- readiness
104104
- --component
105105
- mongod
106+
- --ssl
107+
- --sslInsecure
108+
- --sslCAFile
109+
- /etc/mongodb-ssl/ca.crt
110+
- --sslPEMKeyFile
111+
- /tmp/tls.pem
106112
failureThreshold: 8
107113
initialDelaySeconds: 10
108114
periodSeconds: 3

0 commit comments

Comments
 (0)