Unify termination grace period & make it parametric for swh apps
This allows to override it for the staging-cassandra-next-version deployment and make it stop faster.
$ make helm-diff
cd swh && ./helm-diff.sh
Comparing changes between branches production and parametric-termination-grace-period...
Switched to branch 'production'
Your branch is up to date with 'origin/production'.
Generate config in production branch for values/default.yaml...
Generate config in production branch for values/production-cassandra.yaml...
Generate config in production branch for values/production.yaml...
Generate config in production branch for values/staging-cassandra.yaml...
Generate config in production branch for values/staging.yaml...
Switched to branch 'parametric-termination-grace-period'
Generate config in parametric-termination-grace-period branch for values/default.yaml...
Generate config in parametric-termination-grace-period branch for values/production-cassandra.yaml...
Generate config in parametric-termination-grace-period branch for values/production.yaml...
Generate config in parametric-termination-grace-period branch for values/staging-cassandra.yaml...
Generate config in parametric-termination-grace-period branch for values/staging.yaml...
------------- diff for values/default.yaml -------------
No differences
------------- diff for values/production-cassandra.yaml -------------
No differences
------------- diff for values/production.yaml -------------
--- /tmp/swh-chart.bSEH36h4/production.yaml.before 2023-07-12 15:24:26.781796810 +0200
+++ /tmp/swh-chart.bSEH36h4/production.yaml.after 2023-07-12 15:24:27.177797468 +0200
@@ -1472,20 +1472,21 @@
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/lister
operator: In
values:
- "true"
+ terminationGracePeriodSeconds: 3600
initContainers:
- name: prepare-configuration
image: debian:bullseye
imagePullPolicy: Always
env:
- name: AMQP_USERNAME
valueFrom:
secretKeyRef:
name: common-secrets
key: rabbitmq-amqp-username
@@ -1633,20 +1634,21 @@
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/lister
operator: In
values:
- "true"
+ terminationGracePeriodSeconds: 3600
initContainers:
- name: prepare-configuration
image: debian:bullseye
imagePullPolicy: Always
env:
- name: AMQP_USERNAME
valueFrom:
secretKeyRef:
name: common-secrets
key: rabbitmq-amqp-username
@@ -1794,20 +1796,21 @@
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/lister
operator: In
values:
- "true"
+ terminationGracePeriodSeconds: 3600
initContainers:
- name: prepare-configuration
image: debian:bullseye
imagePullPolicy: Always
env:
- name: AMQP_USERNAME
valueFrom:
secretKeyRef:
name: common-secrets
key: rabbitmq-amqp-username
@@ -1955,20 +1958,21 @@
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/lister
operator: In
values:
- "true"
+ terminationGracePeriodSeconds: 3600
initContainers:
- name: prepare-configuration
image: debian:bullseye
imagePullPolicy: Always
env:
- name: AMQP_USERNAME
valueFrom:
secretKeyRef:
name: common-secrets
key: rabbitmq-amqp-username
------------- diff for values/staging-cassandra.yaml -------------
No differences
------------- diff for values/staging.yaml -------------
--- /tmp/swh-chart.bSEH36h4/staging.yaml.before 2023-07-12 15:24:26.993797162 +0200
+++ /tmp/swh-chart.bSEH36h4/staging.yaml.after 2023-07-12 15:24:27.385797813 +0200
@@ -2797,20 +2797,21 @@
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/cooker
operator: In
values:
- "true"
+ terminationGracePeriodSeconds: 3600
initContainers:
- name: prepare-configuration
image: debian:bullseye
imagePullPolicy: Always
env:
- name: AMQP_USERNAME
valueFrom:
secretKeyRef:
name: common-secrets
key: rabbitmq-amqp-username
@@ -2940,20 +2941,21 @@
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/cooker
operator: In
values:
- "true"
+ terminationGracePeriodSeconds: 3600
initContainers:
- name: prepare-configuration
image: debian:bullseye
imagePullPolicy: Always
env:
- name: AMQP_USERNAME
valueFrom:
secretKeyRef:
name: common-secrets
key: rabbitmq-amqp-username
@@ -3302,20 +3304,21 @@
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/lister
operator: In
values:
- "true"
+ terminationGracePeriodSeconds: 3600
initContainers:
- name: prepare-configuration
image: debian:bullseye
imagePullPolicy: Always
env:
- name: AMQP_USERNAME
valueFrom:
secretKeyRef:
name: common-secrets
key: rabbitmq-amqp-username
@@ -3463,20 +3466,21 @@
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/lister
operator: In
values:
- "true"
+ terminationGracePeriodSeconds: 3600
initContainers:
- name: prepare-configuration
image: debian:bullseye
imagePullPolicy: Always
env:
- name: AMQP_USERNAME
valueFrom:
secretKeyRef:
name: common-secrets
key: rabbitmq-amqp-username
@@ -3624,20 +3628,21 @@
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/lister
operator: In
values:
- "true"
+ terminationGracePeriodSeconds: 3600
initContainers:
- name: prepare-configuration
image: debian:bullseye
imagePullPolicy: Always
env:
- name: AMQP_USERNAME
valueFrom:
secretKeyRef:
name: common-secrets
key: rabbitmq-amqp-username
@@ -3785,20 +3790,21 @@
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/lister
operator: In
values:
- "true"
+ terminationGracePeriodSeconds: 3600
initContainers:
- name: prepare-configuration
image: debian:bullseye
imagePullPolicy: Always
env:
- name: AMQP_USERNAME
valueFrom:
secretKeyRef:
name: common-secrets
key: rabbitmq-amqp-username
@@ -3946,20 +3952,21 @@
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/lister
operator: In
values:
- "true"
+ terminationGracePeriodSeconds: 3600
initContainers:
- name: prepare-configuration
image: debian:bullseye
imagePullPolicy: Always
env:
- name: AMQP_USERNAME
valueFrom:
secretKeyRef:
name: common-secrets
key: rabbitmq-amqp-username
@@ -4107,20 +4114,21 @@
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/lister
operator: In
values:
- "true"
+ terminationGracePeriodSeconds: 3600
initContainers:
- name: prepare-configuration
image: debian:bullseye
imagePullPolicy: Always
env:
- name: AMQP_USERNAME
valueFrom:
secretKeyRef:
name: common-secrets
key: rabbitmq-amqp-username
@@ -4268,20 +4276,21 @@
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/lister
operator: In
values:
- "true"
+ terminationGracePeriodSeconds: 3600
initContainers:
- name: prepare-configuration
image: debian:bullseye
imagePullPolicy: Always
env:
- name: AMQP_USERNAME
valueFrom:
secretKeyRef:
name: common-secrets
key: rabbitmq-amqp-username
@@ -4429,20 +4438,21 @@
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/lister
operator: In
values:
- "true"
+ terminationGracePeriodSeconds: 3600
initContainers:
- name: prepare-configuration
image: debian:bullseye
imagePullPolicy: Always
env:
- name: AMQP_USERNAME
valueFrom:
secretKeyRef:
name: common-secrets
key: rabbitmq-amqp-username
@@ -4590,20 +4600,21 @@
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/lister
operator: In
values:
- "true"
+ terminationGracePeriodSeconds: 3600
initContainers:
- name: prepare-configuration
image: debian:bullseye
imagePullPolicy: Always
env:
- name: AMQP_USERNAME
valueFrom:
secretKeyRef:
name: common-secrets
key: rabbitmq-amqp-username
@@ -4751,20 +4762,21 @@
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/lister
operator: In
values:
- "true"
+ terminationGracePeriodSeconds: 3600
initContainers:
- name: prepare-configuration
image: debian:bullseye
imagePullPolicy: Always
env:
- name: AMQP_USERNAME
valueFrom:
secretKeyRef:
name: common-secrets
key: rabbitmq-amqp-username
@@ -4912,20 +4924,21 @@
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/lister
operator: In
values:
- "true"
+ terminationGracePeriodSeconds: 3600
initContainers:
- name: prepare-configuration
image: debian:bullseye
imagePullPolicy: Always
env:
- name: AMQP_USERNAME
valueFrom:
secretKeyRef:
name: common-secrets
key: rabbitmq-amqp-username
@@ -5073,20 +5086,21 @@
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/lister
operator: In
values:
- "true"
+ terminationGracePeriodSeconds: 3600
initContainers:
- name: prepare-configuration
image: debian:bullseye
imagePullPolicy: Always
env:
- name: AMQP_USERNAME
valueFrom:
secretKeyRef:
name: common-secrets
key: rabbitmq-amqp-username
@@ -5234,20 +5248,21 @@
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/lister
operator: In
values:
- "true"
+ terminationGracePeriodSeconds: 3600
initContainers:
- name: prepare-configuration
image: debian:bullseye
imagePullPolicy: Always
env:
- name: AMQP_USERNAME
valueFrom:
secretKeyRef:
name: common-secrets
key: rabbitmq-amqp-username
@@ -5395,20 +5410,21 @@
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/lister
operator: In
values:
- "true"
+ terminationGracePeriodSeconds: 3600
initContainers:
- name: prepare-configuration
image: debian:bullseye
imagePullPolicy: Always
env:
- name: AMQP_USERNAME
valueFrom:
secretKeyRef:
name: common-secrets
key: rabbitmq-amqp-usernameEdited by Antoine R. Dumont