Made terminationGracePeriodSeconds configurable (helm#21385)

Signed-off-by: Michal Koziorowski <Michal.Koziorowski@tomtom.com> Co-authored-by: Michal Koziorowski <Michal.Koziorowski@tomtom.com>
vboulineau · Mar 12, 2020 · 3fc1bb3 · 3fc1bb3
1 parent 5f56365
commit 3fc1bb3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/incubator/haproxy-ingress/Chart.yaml b/incubator/haproxy-ingress/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: haproxy-ingress
-version: 0.0.22
+version: 0.0.23
 appVersion: 0.7.2
 home: https://github.com/jcmoraisjr/haproxy-ingress
 description: Ingress controller implementation for haproxy loadbalancer.

diff --git a/incubator/haproxy-ingress/README.md b/incubator/haproxy-ingress/README.md
@@ -73,6 +73,7 @@ Parameter | Description | Default
 `controller.config` | additional haproxy-ingress [ConfigMap entries](https://github.com/jcmoraisjr/haproxy-ingress/blob/v0.6/README.md#configmap) | `{}`
 `controller.hostNetwork` | Optionally set to true when using CNI based kubernetes installations | `false`
 `controller.dnsPolicy` | Optionally change this to ClusterFirstWithHostNet in case you have 'hostNetwork: true' | `ClusterFirst`
+`controller.terminationGracePeriodSeconds` | How much to wait before terminating a pod (in seconds) | `60`
 `controller.kind` | Type of deployment, DaemonSet or Deployment | `Deployment`
 `controller.tcp` | TCP [service ConfigMap](https://github.com/jcmoraisjr/haproxy-ingress/blob/v0.6/README.md#tcp-services-configmap): `<port>: <namespace>/<servicename>:<portnumber>[:[<in-proxy>][:<out-proxy>]]` | `{}`
 `controller.enableStaticPorts` | Set to `false` to only rely on ports from `controller.tcp` | `true`

diff --git a/incubator/haproxy-ingress/templates/controller-daemonset.yaml b/incubator/haproxy-ingress/templates/controller-daemonset.yaml
@@ -177,7 +177,7 @@ spec:
           configMap:
             name: {{ template "haproxy-ingress.controller.fullname" . }}-template
 {{- end }}
-      terminationGracePeriodSeconds: 60
+      terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }}
       dnsPolicy: {{ .Values.controller.dnsPolicy }}
       hostNetwork: {{ .Values.controller.hostNetwork }}
     {{- if .Values.controller.nodeSelector }}

diff --git a/incubator/haproxy-ingress/templates/controller-deployment.yaml b/incubator/haproxy-ingress/templates/controller-deployment.yaml
@@ -171,7 +171,7 @@ spec:
           configMap:
             name: {{ template "haproxy-ingress.controller.fullname" . }}-template
 {{- end }}
-      terminationGracePeriodSeconds: 60
+      terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }}
       dnsPolicy: {{ .Values.controller.dnsPolicy }}
       hostNetwork: {{ .Values.controller.hostNetwork }}
     {{- if .Values.controller.nodeSelector }}

diff --git a/incubator/haproxy-ingress/values.yaml b/incubator/haproxy-ingress/values.yaml
@@ -111,6 +111,9 @@ controller:
   # to keep resolving names inside the k8s network, use ClusterFirstWithHostNet.
   dnsPolicy: ClusterFirst
 
+  # How many seconds to wait before terminating a pod.
+  terminationGracePeriodSeconds: 60
+
   ## DaemonSet or Deployment
   ##
   kind: Deployment