[Monochart 0.27.0] Feature: deployment.yaml volume mounts (#275)

* `[Monochart]` Feature: `deployment.yaml` volume mounts (#273)

* update chart to allow volumes

* update chart for more conditionals, fixes Volumes, Volume Mounts, Pull Secrets, ENV

(cherry picked from commit 61ffa1b)

* update version

Author: Benbentwo

incubator/monochart/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
 description: A declarative helm chart for deploying common types of services on Kubernetes
 name: monochart
-version: 0.26.0
-appVersion: 0.26.0
+version: 0.27.0
+appVersion: 0.27.0
 home: https://github.com/cloudposse/charts/tree/master/incubator/monochart
 icon: https://raw.githubusercontent.com/cloudposse/charts/master/incubator/monochart/logo.png
 maintainers:

incubator/monochart/templates/_helpers.tpl

@@ -61,11 +61,16 @@ env:
     value: {{ default "" $value | quote }}
 {{- end }}
 {{- end }}
+
 {{/*
 https://kubernetes.io/docs/tasks/inject-data-application/environment-variable-expose-pod-information/#use-pod-fields-as-values-for-environment-variables
 */}}
 {{- with $root.Values.envFromFieldRefFieldPath }}
+
+{{/* Only add env block if not used by above .Values.env */}}
+{{- if not $root.Values.env}}
 env:
+{{- end }}
 {{- range $name, $value := . }}
   - name: {{ $name }}
     valueFrom:

incubator/monochart/templates/deployment.yaml

@@ -96,33 +96,44 @@ spec:
             protocol: {{ default "TCP" $port.protocol  }}
 {{- end }}
 {{- end }}
+        {{- if or .Values.deployment.pod.volumeMounts .Values.persistence.enabled .Values.configMaps.enabled .Values.secrets.enabled }}
         volumeMounts:
+        {{- if .Values.deployment.pod.volumeMounts }}
+        {{- toYaml .Values.deployment.pod.volumeMounts | nindent 8 }}
+        {{- end }}
         {{- if .Values.persistence.enabled }}
         - mountPath: {{ .Values.persistence.mountPath | quote }}
           name: storage
         {{- end }}
         {{- include "monochart.files.volumeMounts" . |  nindent 8 }}
+        {{- end }}
 {{- with .Values.probes }}
 {{ toYaml . | indent 8 }}
 {{- end }}
 {{- with .Values.resources }}
         resources:
 {{ toYaml . | indent 10 }}
 {{- end }}
-{{- with .Values.deployment.pod.hostAliases }}
+      {{- with .Values.deployment.pod.hostAliases }}
       hostAliases:
-{{ toYaml . | indent 8 }}
-{{- end }}
+        {{- toYaml . | indent 8 }}
+      {{- end }}
+    {{- if or .Values.dockercfg.enabled .Values.image.pullSecrets }}
       imagePullSecrets:
-{{- if .Values.dockercfg.enabled }}
+    {{- end }}
+      {{- if .Values.dockercfg.enabled }}
         - name: {{ include "common.fullname" . }}
-{{- end }}
-{{- with .Values.image.pullSecrets }}
+      {{- end }}
+    {{- with .Values.image.pullSecrets }}
       {{- range . }}
         - name: {{ . }}
       {{- end }}
-{{- end }}
+    {{- end }}
+    {{- if or .Values.deployment.volumes .Values.persistence.enabled .Values.configMaps.enabled .Values.secrets.enabled }}
       volumes:
+      {{- if .Values.deployment.volumes }}
+        {{- toYaml .Values.deployment.volumes | nindent 6 }}
+      {{- end }}
       {{- if .Values.persistence.enabled }}
       - name: storage
       {{- if .Values.persistence.enabled }}
@@ -133,4 +144,6 @@ spec:
       {{- end }}
       {{- end }}
       {{- include "monochart.files.volumes" . | nindent 6 }}
+      {{- end }}
+      
 {{- end -}}

incubator/monochart/test/full.yaml

@@ -65,6 +65,16 @@ deployment:
     ## https://github.com/jtblin/kube2iam
     #  iam.amazonaws.com/role: role-arn
     labels: {}
+    
+  ## Directly attach Volume
+    volumeMounts:
+      - name: apmsocketpath
+        mountPath: /var/run/datadog
+  volumes:
+    - hostPath:
+        path: /var/run/datadog/
+      name: apmsocketpath
+      
   affinity:
     # use of simple rule
     affinityRule: "ShouldBeOnDifferentNode"

incubator/monochart/values.yaml

@@ -103,6 +103,15 @@ deployment:
     labels: {}
     # command:
     args: []
+    
+    volumeMounts: []
+    # - name: apmsocketpath
+    #   mountPath: /var/run/datadog
+    
+  volumes: []
+  # - name: apmsocketpath
+  #   hostPath:
+  #     path: /var/run/datadog/
 
 statefulset:
   enabled: false