Add extra options to helm chart (#73)

* add helm option to change the frontend service name * add helm option to set varnish container lifecycle options * add helm option to add extracontainers to the pod * add helm option to set the pod termination grace period
mittwald · May 12, 2021 · 3be215e · 3be215e
1 parent 50372f1
commit 3be215e
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 3 deletions.
diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
@@ -56,7 +56,7 @@ spec:
           - -signaller-port=8090
           - -frontend-watch
           - -frontend-namespace={{ "$(NAMESPACE)" }}
-          - -frontend-service={{ include "kube-httpcache.fullname" . }}
+          - -frontend-service={{ .Values.cache.frontendService | default (include "kube-httpcache.fullname" .) }}
           {{- if .Values.cache.backendWatch }}
           - -backend-watch
           {{- else }}
@@ -77,6 +77,10 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
+          {{- if .Values.lifecycle }}
+          lifecycle:
+            {{- toYaml .Values.lifecycle | nindent 12 }}
+          {{- end }}
           volumeMounts:
           - name: template
             mountPath: /etc/varnish/tmpl
@@ -123,6 +127,9 @@ spec:
             {{- toYaml .Values.exporter.resources | nindent 12 }}
           {{- end }}
         {{- end }}
+        {{- if .Values.extraContainers }}
+          {{- toYaml .Values.extraContainers | nindent 8 }}
+        {{- end }}
       volumes:
       {{- if .Values.configmap.enabled }}
       - name: template
@@ -149,4 +156,7 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.terminationGracePeriodSeconds }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
+      {{- end }}
 {{- end }}
diff --git a/chart/templates/statefulset.yaml b/chart/templates/statefulset.yaml
@@ -49,7 +49,7 @@ spec:
           - -signaller-port=8090
           - -frontend-watch
           - -frontend-namespace={{ "$(NAMESPACE)" }}
-          - -frontend-service={{ include "kube-httpcache.fullname" . }}
+          - -frontend-service={{ .Values.cache.frontendService | default (include "kube-httpcache.fullname" .) }}
           {{- if .Values.cache.backendWatch }}
           - -backend-watch
           {{- else }}
@@ -70,6 +70,10 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
+          {{- if .Values.lifecycle }}
+          lifecycle:
+            {{- toYaml .Values.lifecycle | nindent 12 }}
+          {{- end }}
           volumeMounts:
           - name: template
             mountPath: /etc/varnish/tmpl
@@ -124,6 +128,9 @@ spec:
             {{- toYaml .Values.exporter.resources | nindent 12 }}
           {{- end }}
         {{- end }}
+        {{- if .Values.extraContainers }}
+          {{- toYaml .Values.extraContainers | nindent 8 }}
+        {{- end }}
       volumes:
      {{- if .Values.configmap.enabled }}
       - name: template
@@ -150,4 +157,7 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.terminationGracePeriodSeconds }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
+      {{- end }}
 {{- end }}
diff --git a/chart/values.yaml b/chart/values.yaml
@@ -24,6 +24,8 @@ configmap:
 
 # kube-httpcache specific configuration
 cache:
+  # name of backend service
+  # frontendService: kube-httpcache-headless
   # name of backend service
   backendService: backend-service
   # name of backend service namespace
@@ -76,6 +78,14 @@ securityContext: {}
   # runAsNonRoot: true
   # runAsUser: 1000
 
+lifecycle: {}
+  # preStop:
+  #   exec:
+  #     command:
+  #     - /bin/sh
+  #     - -c
+  #     - touch /etc/varnish/fail_probes; sleep 25
+
 initContainers: {}
 # initContainers: |
 #   - args:
@@ -93,7 +103,13 @@ initContainers: {}
 #     volumeMounts:
 #     - name: template
 #       mountPath: /etc/varnish/tmpl
-#
+
+extraContainers: []
+# - name: my-sidecar
+#   image: myapp/my-sidecar
+#   command:
+#   - my-sidecar-command
+
 extraVolumes: {}
 # extraVolumes:
 #   - emptyDir: {}
@@ -183,6 +199,8 @@ nodeSelector: {}
 
 tolerations: []
 
+#terminationGracePeriodSeconds: 60
+
 affinity: {}
 
 livenessProbe: {}