MINOR: Add terminationGracePeriodSeconds to both HAProxy Chart and

Ingress Controller Chart.

CI: Update Chart Testing to latest image and Kind to 0.9.0.
Release HAProxy Chart 1.1.0 and Ingress Controller Chart 1.8.0.

Signed-off-by: Dinko Korunic <[email protected]>

Author: dkorunic

.circleci/install_charts.sh

@@ -4,8 +4,8 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-readonly CT_VERSION=v3.0.0-beta.1
-readonly KIND_VERSION=v0.6.1
+readonly CT_VERSION=latest
+readonly KIND_VERSION=v0.9.0
 readonly CLUSTER_NAME=chart-testing
 readonly REPO_ROOT="${REPO_ROOT:-$(git rev-parse --show-toplevel)}"
 

haproxy/Chart.yaml

@@ -14,7 +14,7 @@
 
 apiVersion: v1
 name: haproxy
-version: 1.0.1
+version: 1.1.0
 kubeVersion: ">=1.12.0-0"
 description: A Helm chart for HAProxy on Kubernetes
 keywords:

haproxy/templates/daemonset.yaml

@@ -47,6 +47,7 @@ spec:
       {{- end }}
     spec:
       serviceAccountName: {{ include "haproxy.serviceAccountName" . }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
       {{- if $useHostNetwork }}
       hostNetwork: true
       {{- end }}

haproxy/templates/deployment.yaml

@@ -46,6 +46,7 @@ spec:
       {{- end }}
     spec:
       serviceAccountName: {{ include "haproxy.serviceAccountName" . }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
 {{- if .Values.dnsConfig }}

haproxy/values.yaml

@@ -55,6 +55,10 @@ initContainers: []
 #   securityContext:
 #     privileged: true
 
+## Pod termination grace period
+## ref: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/
+terminationGracePeriodSeconds: 60
+
 ## Private Registry configuration
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
 imageCredentials:

kubernetes-ingress/Chart.yaml

@@ -14,7 +14,7 @@
 
 apiVersion: v1
 name: kubernetes-ingress
-version: 1.7.0
+version: 1.8.0
 kubeVersion: ">=1.12.0-0"
 description: A Helm chart for HAProxy Kubernetes Ingress Controller
 keywords:

kubernetes-ingress/templates/controller-daemonset.yaml

@@ -53,6 +53,7 @@ spec:
       {{- end }}
     spec:
       serviceAccountName: {{ template "kubernetes-ingress.serviceAccountName" . }}
+      terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }}
       {{- if $useHostNetwork }}
       hostNetwork: true
       {{- end }}

kubernetes-ingress/templates/controller-deployment.yaml

@@ -52,6 +52,7 @@ spec:
       {{- end }}
     spec:
       serviceAccountName: {{ template "kubernetes-ingress.serviceAccountName" . }}
+      terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }}
 {{- if .Values.controller.dnsConfig }}
       dnsConfig:
 {{ toYaml .Values.controller.dnsConfig | indent 8 }}

kubernetes-ingress/templates/default-backend-deployment.yaml

@@ -75,6 +75,7 @@ spec:
         {{- toYaml . | nindent 8 }}
     {{- end }}
       serviceAccountName: {{ template "kubernetes-ingress.defaultBackend.serviceAccountName" . }}
+      terminationGracePeriodSeconds: 60
     {{- with .Values.defaultBackend.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}

kubernetes-ingress/values.yaml

@@ -68,6 +68,10 @@ controller:
   #   securityContext:
   #     privileged: true
 
+  ## Pod termination grace period
+  ## ref: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/
+  terminationGracePeriodSeconds: 60
+
   ## Private Registry configuration
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
   imageCredentials: