[stable/gocd] Volume mount config map even if persistence is disabled. (#8772)

* Volume mount the config map to preconfigure the server even if persistence is disabled.
* The value for .Values.server.persistence.enabled should be used for volume mounting GoCD related directories such as config, db, etc.
Preconfiguring the GoCD server is should be done even if persistence is not enabled. (#8579)

Signed-off-by: Varsha Varadarajan <varshasvaradarajan@gmail.com>

* Update changelog.

Signed-off-by: Varsha Varadarajan <varshasvaradarajan@gmail.com>

stable/gocd/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 1.5.5
+
+* [22f3354](https://github.com/helm/charts/commit/22f3354):
+  - Volume mount the config map to preconfigure the server even if persistence is disabled. ([#8579](https://github.com/helm/charts/issues/8579))
+
 ### 1.5.4
 
 * [4018a215](https://github.com/kubernetes/charts/commit/4018a215):

stable/gocd/Chart.yaml

@@ -1,6 +1,6 @@
 name: gocd
 home: https://www.gocd.org/
-version: 1.5.4
+version: 1.5.5
 appVersion: 18.10.0
 description: GoCD is an open-source continuous delivery server to model and visualize complex workflows with ease.
 icon: https://gocd.github.io/assets/images/go-icon-black-192x192.png

stable/gocd/templates/configmap.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.server.shouldPreconfigure }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -134,3 +135,5 @@ data:
                   }' >> /godata/logs/preconfigure.log )
 
     echo "Done preconfiguring the GoCD server" > /godata/logs/preconfigure_complete.log
+
+{{- end }}

stable/gocd/templates/gocd-server-deployment.yaml

@@ -26,16 +26,18 @@ spec:
         component: server
     spec:
       serviceAccountName: {{ template "gocd.serviceAccountName" . }}
-      {{- if or .Values.server.persistence.enabled .Values.server.security.ssh.enabled }}
+      {{- if or .Values.server.shouldPreconfigure (or .Values.server.persistence.enabled .Values.server.security.ssh.enabled) }}
       volumes:
       {{- end }}
+      {{- if .Values.server.shouldPreconfigure }}
+        - name: config-vol
+          configMap:
+            name: {{ template "gocd.fullname" . }}
+      {{- end }}
       {{- if .Values.server.persistence.enabled }}
         - name: goserver-vol
           persistentVolumeClaim:
             claimName: {{ .Values.server.persistence.existingClaim | default (printf "%s-%s" (include "gocd.fullname" .) "server") }}
-        - name: config-vol
-          configMap:
-            name: {{ template "gocd.fullname" . }}
         {{- if ne (len .Values.server.persistence.extraVolumes) 0 }}
 {{ toYaml .Values.server.persistence.extraVolumes | indent 8 }}
         {{- end }}
@@ -78,9 +80,14 @@ spec:
             initialDelaySeconds: {{ .Values.server.healthCheck.initialDelaySeconds }}
             periodSeconds: {{ .Values.server.healthCheck.periodSeconds }}
             failureThreshold: {{ .Values.server.healthCheck.failureThreshold }}
-          {{- if or .Values.server.persistence.enabled .Values.server.security.ssh.enabled }}
+          {{- if or .Values.server.shouldPreconfigure (or .Values.server.persistence.enabled .Values.server.security.ssh.enabled) }}
           volumeMounts:
           {{- end }}
+          {{- if .Values.server.shouldPreconfigure }}
+            - name: config-vol
+              mountPath: /preconfigure_server.sh
+              subPath: preconfigure_server.sh
+          {{- end }}
           {{- if .Values.server.persistence.enabled }}
             - name: goserver-vol
               mountPath: /godata
@@ -91,9 +98,6 @@ spec:
             - name: {{ .Values.server.persistence.name.dockerEntryPoint }}
               mountPath: /docker-entrypoint.d
               subPath: {{ .Values.server.persistence.subpath.dockerEntryPoint }}
-            - name: config-vol
-              mountPath: /preconfigure_server.sh
-              subPath: preconfigure_server.sh
             {{- if ne (len .Values.server.persistence.extraVolumeMounts) 0 }}
 {{ toYaml .Values.server.persistence.extraVolumeMounts | indent 12 }}
             {{- end }}