Skip to content

Commit 0b10e0e

Browse files
pooknullhors
andauthored
K8SPSMDB-980: fix cluster deletion (#1329)
* K8SPSMDB-980: fix cluster deletion https://jira.percona.com/browse/K8SPSMDB-980 * fix * add comments * set defaults to `terminationGracePeriodSeconds` * increase default `terminationGracePeriodSeconds` * fix tests * fix `upgrade-consistency-sharded` * So pods can have non-empty `deletionTimestamp` and `ContainersReady: True` condition at the same time. We should not increase counter of ready mongos pods if there is a timestamp Also, there is a possible scenario when we have only 2 pods with the `ContainersReady: True` condition without `deletionTimestamp` and 3 specified in `mongos.Size`. In that case, operator will set mongos status to ready. We should compare `mongos.Size` to the amount of existing mongos pods --------- Co-authored-by: Viacheslav Sarzhan <[email protected]>
1 parent 203d394 commit 0b10e0e

File tree

155 files changed

+368
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+368
-174
lines changed

e2e-tests/arbiter/compare/statefulset_arbiter-clusterip-rs0-arbiter-oc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ spec:
162162
securityContext: {}
163163
serviceAccount: default
164164
serviceAccountName: default
165-
terminationGracePeriodSeconds: 30
165+
terminationGracePeriodSeconds: 60
166166
volumes:
167167
- name: arbiter-clusterip-mongodb-keyfile
168168
secret:

e2e-tests/arbiter/compare/statefulset_arbiter-clusterip-rs0-arbiter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ spec:
158158
fsGroup: 1001
159159
serviceAccount: default
160160
serviceAccountName: default
161-
terminationGracePeriodSeconds: 30
161+
terminationGracePeriodSeconds: 60
162162
volumes:
163163
- name: arbiter-clusterip-mongodb-keyfile
164164
secret:

e2e-tests/arbiter/compare/statefulset_arbiter-rs0-arbiter-oc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ spec:
161161
restartPolicy: Always
162162
schedulerName: default-scheduler
163163
securityContext: {}
164-
terminationGracePeriodSeconds: 30
164+
terminationGracePeriodSeconds: 60
165165
volumes:
166166
- name: arbiter-mongodb-keyfile
167167
secret:

e2e-tests/arbiter/compare/statefulset_arbiter-rs0-arbiter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ spec:
163163
schedulerName: default-scheduler
164164
securityContext:
165165
fsGroup: 1001
166-
terminationGracePeriodSeconds: 30
166+
terminationGracePeriodSeconds: 60
167167
volumes:
168168
- name: arbiter-mongodb-keyfile
169169
secret:

e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-cfg-oc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ spec:
200200
securityContext: {}
201201
serviceAccount: default
202202
serviceAccountName: default
203-
terminationGracePeriodSeconds: 30
203+
terminationGracePeriodSeconds: 60
204204
volumes:
205205
- name: some-name-mongodb-keyfile
206206
secret:

e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-cfg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ spec:
203203
fsGroup: 1001
204204
serviceAccount: default
205205
serviceAccountName: default
206-
terminationGracePeriodSeconds: 30
206+
terminationGracePeriodSeconds: 60
207207
volumes:
208208
- name: some-name-mongodb-keyfile
209209
secret:

e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-rs0-oc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ spec:
213213
securityContext: {}
214214
serviceAccount: default
215215
serviceAccountName: default
216-
terminationGracePeriodSeconds: 30
216+
terminationGracePeriodSeconds: 60
217217
volumes:
218218
- name: some-name-mongodb-keyfile
219219
secret:

e2e-tests/data-at-rest-encryption/compare/statefulset_some-name-rs0.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ spec:
216216
fsGroup: 1001
217217
serviceAccount: default
218218
serviceAccountName: default
219-
terminationGracePeriodSeconds: 30
219+
terminationGracePeriodSeconds: 60
220220
volumes:
221221
- name: some-name-mongodb-keyfile
222222
secret:

e2e-tests/default-cr/compare/statefulset_minimal-cluster-cfg-oc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ spec:
162162
securityContext: {}
163163
serviceAccount: default
164164
serviceAccountName: default
165-
terminationGracePeriodSeconds: 30
165+
terminationGracePeriodSeconds: 60
166166
volumes:
167167
- name: minimal-cluster-mongodb-keyfile
168168
secret:

e2e-tests/default-cr/compare/statefulset_minimal-cluster-cfg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ spec:
164164
fsGroup: 1001
165165
serviceAccount: default
166166
serviceAccountName: default
167-
terminationGracePeriodSeconds: 30
167+
terminationGracePeriodSeconds: 60
168168
volumes:
169169
- name: minimal-cluster-mongodb-keyfile
170170
secret:

0 commit comments

Comments
 (0)