[ stable/concourse ] Add optional values for additional volumes and volumeMounts (#6232)

* Add optional values for additional volumes and volumeMounts

* I have an addiction to additions...

* Add value to override working directory

* Bump minor instead of patch

* Add readme update for new attributes.

* Version bump to 1.15.0

* revert bump to 1.14.0

stable/concourse/Chart.yaml

@@ -1,5 +1,5 @@
 name: concourse
-version: 1.13.0
+version: 1.14.0
 appVersion: 3.14.1
 description: Concourse is a simple and scalable CI system.
 icon: https://avatars1.githubusercontent.com/u/7809479

stable/concourse/README.md

@@ -102,6 +102,7 @@ The following table lists the configurable parameters of the Concourse chart and
 | `concourse.genericOauth.authUrlParam` | Parameters (comma separated) to pass to the authentication server AuthURL | `nil` |
 | `concourse.genericOauth.scope` | Optional scope required to authorize user | `nil` |
 | `concourse.genericOauth.tokenUrl` | Generic OAuth provider TokenURL endpoint | `nil` |
+| `concourse.workingDirectory` | The working directory for concourse | `/concourse-work-dir` |
 | `web.nameOverride` | Override the Concourse Web components name | `nil` |
 | `web.replicas` | Number of Concourse Web replicas | `1` |
 | `web.resources` | Concourse Web resource requests and limits | `{requests: {cpu: "100m", memory: "128Mi"}}` |
@@ -137,6 +138,8 @@ The following table lists the configurable parameters of the Concourse chart and
 | `worker.resources` | Concourse Worker resource requests and limits | `{requests: {cpu: "100m", memory: "512Mi"}}` |
 | `worker.env` | Configure additional environment variables for the worker container(s) | `[]` |
 | `worker.annotations` | Annotations to be added to the worker pods | `{}` |
+| `worker.additionalVolumeMounts` | VolumeMounts to be added to the worker pods | `nil` |
+| `worker.additionalVolumes` | Volumes to be added to the worker pods | `nil` |
 | `worker.additionalAffinities` | Additional affinities to apply to worker pods. E.g: node affinity | `{}` |
 | `worker.tolerations` | Tolerations for the worker nodes | `[]` |
 | `worker.terminationGracePeriodSeconds` | Upper bound for graceful shutdown to allow the worker to drain its tasks | `60` |

stable/concourse/templates/worker-statefulset.yaml

@@ -94,7 +94,7 @@ spec:
             - name: CONCOURSE_TSA_WORKER_PRIVATE_KEY
               value: "/concourse-keys/worker_key"
             - name: CONCOURSE_WORK_DIR
-              value: "/concourse-work-dir"
+              value: {{ .Values.concourse.workingDirectory | quote }}
             - name: CONCOURSE_BAGGAGECLAIM_DRIVER
               value: {{ .Values.concourse.baggageclaimDriver | quote }}
             - name: LIVENESS_PROBE_FATAL_ERRORS
@@ -112,6 +112,9 @@ spec:
               readOnly: true
             - name: concourse-work-dir
               mountPath: /concourse-work-dir
+{{- if .Values.worker.additionalVolumeMounts }}
+{{ toYaml .Values.worker.additionalVolumeMounts | indent 12 }}
+{{- end }}
       affinity:
 {{- if .Values.worker.additionalAffinities }}
 {{ toYaml .Values.worker.additionalAffinities | indent 8 }}
@@ -135,6 +138,9 @@ spec:
                   release: {{ .Release.Name | quote }}
           {{- end }}
       volumes:
+{{- if .Values.worker.additionalVolumes }}
+{{ toYaml .Values.worker.additionalVolumes | indent 8 }}
+{{- end }}
         - name: concourse-keys
           secret:
             secretName: {{ template "concourse.concourse.fullname" . }}

stable/concourse/values.yaml

@@ -63,6 +63,10 @@ concourse:
   ##
   # externalURL:
 
+  ## Working directory used by various concourse parts
+  ##
+  workingDirectory: /concourse-work-dir
+
   ## The filesystem driver used by baggageclaim on workers, can be values
   ## "btrfs", "overlay", or "naive". As of 3.9 "btrfs" is recommended, while "naive" is most
   ## supported but least space efficient. For background see
@@ -380,6 +384,12 @@ worker:
   #   - name: CONCOURSE_GARDEN_DNS_PROXY_ENABLE
   #     value: "true"
 
+  ## Configure additional volumeMounts for the
+  ## worker container(s)
+  # additionalVolumeMounts:
+  #   - name: concourse-baggageclaim
+  #     mountPath: /baggageclaim
+
   ## Annotations to be added to the worker pods.
   ##
   # annotations:
@@ -405,6 +415,14 @@ worker:
   #               values:
   #                 - "true"
 
+  ## Configure additional volumes for the
+  ## worker container(s)
+  # additionalVolumes:
+  #   - name: concourse-baggageclaim
+  #     hostPath:
+  #       path: /dev/nvme0n1
+  #       type: BlockDevice
+
   ## Whether the workers should be forced to run on separate nodes.
   ## This is accomplished by setting their AntiAffinity with requiredDuringSchedulingIgnoredDuringExecution as opposed to preferred
   ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#inter-pod-affinity-and-anti-affinity-beta-feature