Skip to content

Commit fd84546

Browse files
GovSignals BotConProgramming
authored andcommitted
feat(helm): add supervisor.extraVolumes/extraVolumeMounts
Mirrors the existing webapp.extraVolumes / webapp.extraVolumeMounts pattern. Required for compliance environments that need to mount a custom CA bundle ConfigMap into the supervisor pod (e.g. Palantir Rubix or GameWarden CAs) and point NODE_EXTRA_CA_CERTS at it. Both extras render unconditionally — they no longer depend on the legacy bootstrap-disabled volume block — so any consumer can opt in.
1 parent e272fb3 commit fd84546

2 files changed

Lines changed: 26 additions & 2 deletions

File tree

hosting/k8s/helm/templates/supervisor.yaml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,24 +245,34 @@ spec:
245245
{{- with .Values.supervisor.extraEnvVars }}
246246
{{- toYaml . | nindent 12 }}
247247
{{- end }}
248-
{{- if not .Values.webapp.bootstrap.enabled }}
248+
{{- if or (not .Values.webapp.bootstrap.enabled) .Values.supervisor.extraVolumeMounts }}
249249
volumeMounts:
250+
{{- if not .Values.webapp.bootstrap.enabled }}
250251
- name: shared
251252
mountPath: /home/node/shared
253+
{{- end }}
254+
{{- with .Values.supervisor.extraVolumeMounts }}
255+
{{- toYaml . | nindent 12 }}
256+
{{- end }}
252257
{{- end }}
253258
{{- with .Values.supervisor.securityContext }}
254259
securityContext:
255260
{{- toYaml . | nindent 12 }}
256261
{{- end }}
257-
{{- if not .Values.webapp.bootstrap.enabled }}
262+
{{- if or (not .Values.webapp.bootstrap.enabled) .Values.supervisor.extraVolumes }}
258263
volumes:
264+
{{- if not .Values.webapp.bootstrap.enabled }}
259265
- name: shared
260266
{{- if .Values.persistence.shared.enabled }}
261267
persistentVolumeClaim:
262268
claimName: {{ include "trigger-v4.fullname" . }}-shared
263269
{{- else }}
264270
emptyDir: {}
265271
{{- end }}
272+
{{- end }}
273+
{{- with .Values.supervisor.extraVolumes }}
274+
{{- toYaml . | nindent 8 }}
275+
{{- end }}
266276
{{- end }}
267277
{{- with .Values.supervisor.nodeSelector }}
268278
nodeSelector:

hosting/k8s/helm/values.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,20 @@ supervisor:
338338
# - name: CUSTOM_VAR
339339
# value: "custom-value"
340340

341+
# Extra volumes added to the Supervisor pod (e.g. CA bundle ConfigMap)
342+
extraVolumes:
343+
[]
344+
# - name: ca-bundle
345+
# configMap:
346+
# name: my-ca-bundle
347+
348+
# Extra volume mounts added to the Supervisor container
349+
extraVolumeMounts:
350+
[]
351+
# - name: ca-bundle
352+
# mountPath: /etc/ssl/custom-ca
353+
# readOnly: true
354+
341355
# ServiceMonitor for Prometheus monitoring
342356
serviceMonitor:
343357
enabled: false

0 commit comments

Comments
 (0)