Add Graceful Termination to all existing charts

This commit adds graceful termination to all existing charts.
It also adds a setting in the values.yaml file for clarity and
the ability to override if wished.

Change-Id: I42025e4be86d248be467c1d2f0980f864c4d440e

cinder/templates/deployment-api.yaml

@@ -43,6 +43,7 @@ spec:
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.api.timeout | default "30" }}
       containers:
         - name: cinder-api
           image: {{ .Values.images.api }}
@@ -62,6 +63,13 @@ spec:
           ports:
             - name: c-api
               containerPort: {{ .Values.conf.cinder.default.cinder.osapi_volume_listen_port }}
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - kill
+                  - -TERM
+                  - "1"
           readinessProbe:
             tcpSocket:
               port: {{ .Values.conf.cinder.default.cinder.osapi_volume_listen_port }}

cinder/values.yaml

@@ -51,6 +51,10 @@ pod_disruption_budget:
   api:
     min_available: 0
 
+termination_grace_period:
+  api:
+    timeout: 30
+
 keystone:
   admin_user: "admin"
   admin_user_domain: "default"

glance/templates/deployment-api.yaml

@@ -43,6 +43,7 @@ spec:
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.api.timeout | default "600" }}
       containers:
         - name: glance-api
           image: {{ .Values.images.api }}
@@ -61,6 +62,13 @@ spec:
             - /tmp/glance-api.sh
           ports:
             - containerPort: {{ .Values.conf.glance.default.glance.api.bind_port }}
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - kill
+                  - -TERM
+                  - "1"
           readinessProbe:
             tcpSocket:
               port: {{ .Values.conf.glance.default.glance.api.bind_port }}

glance/templates/deployment-registry.yaml

@@ -35,6 +35,7 @@ spec:
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.registry.timeout | default "600" }}
       containers:
         - name: glance-registry
           image: {{ .Values.images.registry }}
@@ -53,6 +54,13 @@ spec:
             - /tmp/glance-registry.sh
           ports:
             - containerPort: {{ .Values.conf.glance_registry.default.glance.registry.bind_port }}
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - kill
+                  - -TERM
+                  - "1"
           readinessProbe:
             tcpSocket:
               port: {{ .Values.conf.glance_registry.default.glance.registry.bind_port }}

glance/values.yaml

@@ -52,6 +52,12 @@ pod_disruption_budget:
   registry:
     min_available: 0
 
+termination_grace_period:
+  api:
+    timeout: 600
+  registry:
+    timeout: 600
+
 bootstrap:
   enabled: true
   images:

heat/templates/deployment-api.yaml

@@ -43,6 +43,7 @@ spec:
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.api.timeout | default "30" }}
       containers:
         - name: heat-api
           image: {{ .Values.images.api }}
@@ -61,6 +62,13 @@ spec:
             - /tmp/heat-api.sh
           ports:
             - containerPort: {{ .Values.conf.heat.heat_api.heat.common.wsgi.bind_port }}
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - kill
+                  - -TERM
+                  - "1"
           readinessProbe:
             tcpSocket:
               port: {{ .Values.conf.heat.heat_api.heat.common.wsgi.bind_port }}

heat/templates/deployment-cfn.yaml

@@ -43,6 +43,7 @@ spec:
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.cfn.timeout | default "30" }}
       containers:
         - name: heat-cfn
           image: {{ .Values.images.cfn }}
@@ -61,6 +62,13 @@ spec:
             - /tmp/heat-cfn.sh
           ports:
             - containerPort: {{ .Values.conf.heat.heat_api_cfn.heat.common.wsgi.bind_port }}
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - kill
+                  - -TERM
+                  - "1"
           readinessProbe:
             tcpSocket:
               port: {{ .Values.conf.heat.heat_api_cfn.heat.common.wsgi.bind_port }}

heat/templates/deployment-cloudwatch.yaml

@@ -43,6 +43,7 @@ spec:
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.cloudwatch.timeout | default "30" }}
       containers:
         - name: heat-cloudwatch
           image: {{ .Values.images.cloudwatch }}
@@ -61,6 +62,13 @@ spec:
             - /tmp/heat-cloudwatch.sh
           ports:
             - containerPort: {{ .Values.conf.heat.heat_api_cloudwatch.heat.common.wsgi.bind_port }}
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - kill
+                  - -TERM
+                  - "1"
           readinessProbe:
             tcpSocket:
               port: {{ .Values.conf.heat.heat_api_cloudwatch.heat.common.wsgi.bind_port }}

heat/values.yaml

@@ -56,6 +56,14 @@ pod_disruption_budget:
   cloudwatch:
     min_available: 0
 
+termination_grace_period:
+  api:
+    timeout: 30
+  cfn:
+    timeout: 30
+  cloudwatch:
+    timeout: 30
+
 keystone_secrets:
   admin: "heat-env-keystone-admin"
   user: "heat-env-keystone-user"

horizon/templates/deployment.yaml

@@ -43,6 +43,7 @@ spec:
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.horizon.timeout | default "30" }}
       containers:
         - name: horizon
           image: {{ .Values.images.horizon }}
@@ -61,6 +62,13 @@ spec:
             - /tmp/start.sh
           ports:
             - containerPort: {{ .Values.network.port }}
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - apachectl
+                  - -k
+                  - graceful-stop
           readinessProbe:
             tcpSocket:
               port: {{ .Values.network.port }}

horizon/values.yaml

@@ -35,6 +35,10 @@ pod_disruption_budget:
   horizon:
     min_available: 0
 
+termination_grace_period:
+  horizon:
+    timeout: 30
+
 labels:
   node_selector_key: openstack-control-plane
   node_selector_value: enabled

keystone/templates/deployment.yaml

@@ -43,6 +43,7 @@ spec:
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.api.timeout | default "30" }}
       containers:
         - name: keystone-api
           image: {{ .Values.images.api }}

keystone/values.yaml

@@ -41,6 +41,10 @@ pod_disruption_budget:
   api:
     min_available: 0
 
+termination_grace_period:
+  api:
+    timeout: 30
+
 keystone:
   version: v3
   scheme: http

magnum/templates/deployment-api.yaml

@@ -43,6 +43,7 @@ spec:
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.api.timeout | default "30" }}
       containers:
         - name: magnum-api
           image: {{ .Values.images.api }}
@@ -58,6 +59,13 @@ spec:
           {{- end }}
           ports:
             - containerPort: {{ .Values.conf.magnum.api.magnum.port }}
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - kill
+                  - -TERM
+                  - "1"
           readinessProbe:
             tcpSocket:
               port: {{ .Values.conf.magnum.api.magnum.port }}

magnum/values.yaml

@@ -48,6 +48,10 @@ pod_disruption_budget:
   api:
     min_available: 0
 
+termination_grace_period:
+  api:
+    timeout: 30
+
 keystone_secrets:
   admin: "magnum-env-keystone-admin"
   user: "magnum-env-keystone-user"

mistral/templates/deployment-api.yaml

@@ -43,6 +43,7 @@ spec:
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.api.timeout | default "30" }}
       containers:
         - name: mistral-api
           image: {{ .Values.images.api }}
@@ -62,6 +63,13 @@ spec:
           ports:
             - name: {{ .Values.network.api.name }}
               containerPort: {{ .Values.conf.mistral.api.mistral.config.port }}
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - kill
+                  - -TERM
+                  - "1"
           readinessProbe:
             tcpSocket:
               port: {{ .Values.conf.mistral.api.mistral.config.port }}

mistral/values.yaml

@@ -52,6 +52,10 @@ pod_disruption_budget:
   api:
     min_available: 0
 
+termination_grace_period:
+  api:
+    timeout: 30
+
 keystone_secrets:
   admin: "mistral-env-keystone-admin"
   user: "mistral-env-keystone-user"

neutron/templates/deployment-server.yaml

@@ -43,6 +43,7 @@ spec:
     spec:
       nodeSelector:
         {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }}
+      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.server.timeout | default "30" }}
       containers:
         - name: neutron-server
           image: {{ .Values.images.server }}
@@ -58,6 +59,13 @@ spec:
           {{- end }}
           ports:
             - containerPort: {{ .Values.network.server.port }}
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - kill
+                  - -TERM
+                  - "1"
           readinessProbe:
             tcpSocket:
               port: {{ .Values.network.server.port }}

neutron/values.yaml

@@ -47,6 +47,10 @@ pod_disruption_budget:
   server:
     min_available: 0
 
+termination_grace_period:
+  server:
+    timeout: 30
+
 labels:
   # ovs is a special case, requiring a special
   # label that can apply to both control hosts
@@ -518,4 +522,4 @@ mounts:
     neutron_metadata_agent:
   neutron_ovs_agent:
     init_container: null
-    neutron_ovs_agent:
+    neutron_ovs_agent:

nova/templates/deployment-api-metadata.yaml

@@ -43,6 +43,7 @@ spec:
     spec:
       nodeSelector:
         {{ .Values.labels.api_metadata.node_selector_key }}: {{ .Values.labels.api_metadata.node_selector_value }}
+      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.metadata.timeout | default "30" }}
       containers:
         - name: nova-api
           image: {{ .Values.images.api }}
@@ -63,6 +64,13 @@ spec:
                 - NET_ADMIN
           ports:
             - containerPort: {{ .Values.network.metadata.port }}
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - kill
+                  - -TERM
+                  - "1"
           readinessProbe:
             tcpSocket:
               port: {{ .Values.network.metadata.port }}

nova/templates/deployment-api-osapi.yaml

@@ -43,6 +43,7 @@ spec:
     spec:
       nodeSelector:
         {{ .Values.labels.osapi.node_selector_key }}: {{ .Values.labels.osapi.node_selector_value }}
+      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.osapi.timeout | default "30" }}
       containers:
         - name: nova-osapi
           image: {{ .Values.images.api }}
@@ -62,6 +63,13 @@ spec:
           {{- end }}
           ports:
             - containerPort: {{ .Values.network.osapi.port }}
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - kill
+                  - -TERM
+                  - "1"
           readinessProbe:
             tcpSocket:
               port: {{ .Values.network.osapi.port }}

nova/values.yaml

@@ -81,6 +81,12 @@ pod_disruption_budget:
   osapi:
     min_available: 0
 
+termination_grace_period:
+  metadata:
+    timeout: 30
+  osapi:
+    timeout: 30
+
 bootstrap:
   enabled: true
   flavors:

senlin/templates/deployment-api.yaml

@@ -43,6 +43,7 @@ spec:
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.api.timeout | default "30" }}
       containers:
         - name: senlin-api
           image: {{ .Values.images.api }}
@@ -64,6 +65,13 @@ spec:
           command:
             - bash
             - /tmp/senlin-api.sh
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - kill
+                  - -TERM
+                  - "1"
           volumeMounts:
             - name: senlin-bin
               mountPath: /tmp/senlin-api.sh

senlin/values.yaml

@@ -48,6 +48,10 @@ pod_disruption_budget:
   api:
     min_available: 0
 
+termination_grace_period:
+  api:
+    timeout: 30
+
 keystone_secrets:
   admin: "senlin-env-keystone-admin"
   user: "senlin-env-keystone-user"