Merge pull request #170 from nutmegdevelopment/task/extra-deployment-…

…containers

Add support for more features in helm chart

charts/kminion/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.9.0
+version: 0.10.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/kminion/templates/deployment.yaml

@@ -5,6 +5,9 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "kminion.labels" . | nindent 4}}
+    {{- with .Values.deployment.labels}}
+    {{- toYaml . | nindent 4}}
+    {{- end}}
   {{- with .Values.deployment.annotations}}
   annotations:
     {{- toYaml . | nindent 4}}
@@ -44,6 +47,13 @@ spec:
           secret:
             secretName: {{.secretName}}
         {{- end}}
+        {{- with .Values.deployment.volumes.extra }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      initContainers:
+      {{- with .Values.deployment.initContainers }}
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{.Chart.Name}}
           securityContext:
@@ -84,11 +94,16 @@ spec:
             {{- end}}
           resources:
             {{- toYaml .Values.resources | nindent 12}}
+          {{- if .Values.deployment.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
               path: /ready
               port: {{.Values.service.port}}
             initialDelaySeconds: 10
+          {{- end }}
+        {{- with .Values.deployment.extraContainers }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       {{- with .Values.nodeSelector}}
       nodeSelector:
         {{- toYaml . | nindent 8}}

charts/kminion/values.yaml

@@ -27,6 +27,7 @@ podAnnotations: {}
 #  prometheus.io/scrape: "true"
 #  prometheus.io/port: "8080"
 #  prometheus.io/path: "/metrics"
+
 podSecurityContext:
   runAsUser: 99
   fsGroup: 99
@@ -109,13 +110,20 @@ daemonset:
   enabled: false
 
 deployment:
+  readinessProbe:
+    enabled: true
+
+  labels: {}
   # Annotations to add to the Deployment resource
   annotations: {}
   volumes:
     # Mount files from Kubernetes secrets into the container
     secrets: []
     # - secretName: vault-tls
     #   mountPath: /vault/tls
+    extra: []
+    # - name: example
+    #   emptyDir: {}
 
   # If you want to provide specifc config settings like sensitive Kafka credentials via environment variables you can
   # do so by making them available here. See the kminion reference config to figure out the expected variable names.
@@ -137,6 +145,11 @@ deployment:
     #   secretName: kafka-credentials-team-xy
     #   secretKey: password
 
+  # Add additional containers, e. g. for oauth2-proxy
+  extraContainers: {}
+  # Add additional init containers, e. g. for oauth2-proxy
+  initContainers: {}
+
 kminion:
   # KMinion can be configured using environment variables and/or a YAML config. The yaml contents under config will
   # end up in a YAML file which will be mounted into the kminion container.