Skip to content

Commit ac2998d

Browse files
committed
support external secrets
1 parent db6ca9d commit ac2998d

File tree

5 files changed

+31
-7
lines changed

5 files changed

+31
-7
lines changed

hosting/k8s/helm/templates/_helpers.tpl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,17 @@ http://{{ include "trigger-v4.fullname" . }}-minio:{{ .Values.minio.service.port
147147
{{- end -}}
148148
{{- end }}
149149

150+
{{/*
151+
Get the secrets name - either existing secret or generated name
152+
*/}}
153+
{{- define "trigger-v4.secretsName" -}}
154+
{{- if .Values.secrets.existingSecret -}}
155+
{{ .Values.secrets.existingSecret }}
156+
{{- else -}}
157+
{{ include "trigger-v4.fullname" . }}-secrets
158+
{{- end -}}
159+
{{- end }}
160+
150161
{{/*
151162
Registry connection details
152163
*/}}

hosting/k8s/helm/templates/secrets.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if not .Values.secrets.existingSecret }}
12
apiVersion: v1
23
kind: Secret
34
metadata:
@@ -12,6 +13,7 @@ data:
1213
managed-worker-secret: {{ .Values.secrets.managedWorkerSecret | b64enc | quote }}
1314
object-store-access-key-id: {{ .Values.secrets.objectStore.accessKeyId | b64enc | quote }}
1415
object-store-secret-access-key: {{ .Values.secrets.objectStore.secretAccessKey | b64enc | quote }}
16+
{{- end }}
1517
---
1618
{{- if and .Values.registry.enabled .Values.registry.auth.enabled }}
1719
apiVersion: v1

hosting/k8s/helm/templates/supervisor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ spec:
121121
- name: MANAGED_WORKER_SECRET
122122
valueFrom:
123123
secretKeyRef:
124-
name: {{ include "trigger-v4.fullname" . }}-secrets
124+
name: {{ include "trigger-v4.secretsName" . }}
125125
key: managed-worker-secret
126126
# Worker instance configuration
127127
- name: TRIGGER_WORKER_INSTANCE_NAME

hosting/k8s/helm/templates/webapp.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,32 +128,32 @@ spec:
128128
- name: SESSION_SECRET
129129
valueFrom:
130130
secretKeyRef:
131-
name: {{ include "trigger-v4.fullname" . }}-secrets
131+
name: {{ include "trigger-v4.secretsName" . }}
132132
key: session-secret
133133
- name: MAGIC_LINK_SECRET
134134
valueFrom:
135135
secretKeyRef:
136-
name: {{ include "trigger-v4.fullname" . }}-secrets
136+
name: {{ include "trigger-v4.secretsName" . }}
137137
key: magic-link-secret
138138
- name: ENCRYPTION_KEY
139139
valueFrom:
140140
secretKeyRef:
141-
name: {{ include "trigger-v4.fullname" . }}-secrets
141+
name: {{ include "trigger-v4.secretsName" . }}
142142
key: encryption-key
143143
- name: MANAGED_WORKER_SECRET
144144
valueFrom:
145145
secretKeyRef:
146-
name: {{ include "trigger-v4.fullname" . }}-secrets
146+
name: {{ include "trigger-v4.secretsName" . }}
147147
key: managed-worker-secret
148148
- name: OBJECT_STORE_ACCESS_KEY_ID
149149
valueFrom:
150150
secretKeyRef:
151-
name: {{ include "trigger-v4.fullname" . }}-secrets
151+
name: {{ include "trigger-v4.secretsName" . }}
152152
key: object-store-access-key-id
153153
- name: OBJECT_STORE_SECRET_ACCESS_KEY
154154
valueFrom:
155155
secretKeyRef:
156-
name: {{ include "trigger-v4.fullname" . }}-secrets
156+
name: {{ include "trigger-v4.secretsName" . }}
157157
key: object-store-secret-access-key
158158
{{- if .Values.webapp.internal.otel.trace.exporterUrl }}
159159
- name: INTERNAL_OTEL_TRACE_EXPORTER_URL

hosting/k8s/helm/values.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,17 @@ config:
148148
# 2. Override these values in your values.yaml or use external secret management
149149
# 3. Each secret must be exactly 32 hex characters (16 bytes)
150150
secrets:
151+
# Name of existing secret to use instead of creating one
152+
# If empty, a secret will be created with the values below
153+
# The secret must contain the following keys:
154+
# - session-secret
155+
# - magic-link-secret
156+
# - encryption-key
157+
# - managed-worker-secret
158+
# - object-store-access-key-id
159+
# - object-store-secret-access-key
160+
existingSecret: ""
161+
151162
# Session secret for user authentication (32 hex chars)
152163
sessionSecret: "2818143646516f6fffd707b36f334bbb"
153164
# Magic link secret for passwordless login (32 hex chars)

0 commit comments

Comments
 (0)