Adding termination grace period logic (#107)

Author: martinhutton

charts/k8s-service/templates/_deployment_spec.tpl

@@ -339,6 +339,12 @@ spec:
     {{- end }}
     {{- /* END IMAGE PULL SECRETS LOGIC */ -}}
 
+    {{- /* START TERMINATION GRACE PERIOD LOGIC */ -}}
+    {{- if .Values.terminationGracePeriodSeconds }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
+    {{- end}}
+    {{- /* END TERMINATION GRACE PERIOD LOGIC */ -}}
+
     {{- /* START VOLUME LOGIC */ -}}
     {{- if index $hasInjectionTypes "hasVolume" }}
       volumes:

charts/k8s-service/values.yaml

@@ -545,6 +545,14 @@ tolerations: []
 # list is a string that corresponds to the Secret name.
 imagePullSecrets: []
 
+# terminationGracePeriodSeconds sets grace period Kubernetes will wait before terminating the pod. The timeout happens
+# in parallel to preStop hook and the SIGTERM signal, Kubernetes does not wait for preStop to finish before beginning
+# the grace period.
+#
+# EXAMPLE:
+# terminationGracePeriodSeconds: 30
+terminationGracePeriodSeconds: {}
+
 # serviceAccount is a map that configures the ServiceAccount information for the Pod.
 # The expected keys of serviceAccount are:
 #   - name                         (string) : The name of the ServiceAccount in the Namespace where the Pod is deployed

test/k8s_service_volume_template_test.go

@@ -8,6 +8,7 @@ package test
 
 import (
 	"fmt"
+	"strconv"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -115,3 +116,26 @@ func TestK8SServiceDeploymentAddingEmptyDirs(t *testing.T) {
 	assert.Equal(t, volName, volume.Name)
 	assert.Empty(t, volume.EmptyDir)
 }
+
+func TestK8SServiceDeploymentAddingTerminationGracePeriod(t *testing.T) {
+
+	gracePeriod := "30"
+
+	deployment := renderK8SServiceDeploymentWithSetValues(
+		t,
+		map[string]string{
+			"terminationGracePeriodSeconds": gracePeriod,
+		},
+	)
+
+	// Verify that there is only one container
+	renderedPodContainers := deployment.Spec.Template.Spec.Containers
+	require.Equal(t, len(renderedPodContainers), 1)
+
+	expectedGracePeriodInt64, err := strconv.ParseInt(gracePeriod, 10, 64)
+
+	// Verify termination grace period has been set for container
+	assert.NoError(t, err)
+	renderedTerminationGracePeriodSeconds := deployment.Spec.Template.Spec.TerminationGracePeriodSeconds
+	require.Equal(t, expectedGracePeriodInt64, *renderedTerminationGracePeriodSeconds)
+}