Allow not mounting Apache configs, if value volumeMounts.apache.mount…

…Path is set to empty string
helm · Jun 26, 2017 · f131108 · f131108
1 parent c0b35f4
commit f131108
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/stable/drupal/templates/deployment.yaml b/stable/drupal/templates/deployment.yaml
@@ -57,8 +57,10 @@ spec:
         volumeMounts:
         - name: drupal-data
           mountPath: {{ .Values.volumeMounts.drupal.mountPath }}
+        {{- if .Values.volumeMounts.apache.mountPath }}
         - name: apache-data
           mountPath: {{ .Values.volumeMounts.apache.mountPath }}
+        {{- end }}
       {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 8 }}
@@ -71,10 +73,12 @@ spec:
       {{- else }}
         emptyDir: {}
       {{- end }}
+      {{- if .Values.volumeMounts.apache.mountPath }}
       - name: apache-data
       {{- if .Values.persistence.enabled }}
         persistentVolumeClaim:
           claimName: {{ template "fullname" . }}-apache
       {{- else }}
         emptyDir: {}
       {{- end }}
+      {{- end }}
diff --git a/stable/drupal/values.yaml b/stable/drupal/values.yaml
@@ -121,8 +121,10 @@ resources:
     memory: 512Mi
     cpu: 300m
 
-# Configure volume mounts. This is useful for images whose data mount paths are
-# different than the default.
+## Configure volume mounts. This is useful for images whose data mount paths are
+## different than the default.
+## Setting volumeMounts.apache.mountPath to "" prevents Apache config mount.
+##
 volumeMounts:
   drupal:
     mountPath: /bitnami/drupal