Skip to content

Commit 911e6a2

Browse files
feat(helm-collab): Support optional existing secret for Intel connection
Fixes: #170 - add values: intelsecret.enabled/ref - conditionally render templates/secret-intel.yaml - deployment envs read from external secret when enabled(fail if ref missing) - default unchanged (chart still creates "release"-intel)
1 parent 2256e9d commit 911e6a2

3 files changed

Lines changed: 22 additions & 3 deletions

File tree

charts/collab/templates/deployment.yaml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
annotations:
1414
checksum/coturn: {{ include (print $.Template.BasePath "/secret-coturn.yaml") . | sha256sum }}
1515
checksum/dashboard: {{ include (print $.Template.BasePath "/secret-dashboard.yaml") . | sha256sum }}
16-
checksum/intel: {{ include (print $.Template.BasePath "/secret-intel.yaml") . | sha256sum }}
16+
checksum/intel: {{- if not .Values.intelsecret.enabled }} {{ include (print $.Template.BasePath "/secret-intel.yaml") . | sha256sum }} {{- else }} "external" {{- end }}
1717
checksum/ssl: {{ include (print $.Template.BasePath "/secret-ssl.yaml") . | sha256sum }}
1818
{{- with .Values.podAnnotations }}
1919
{{- toYaml . | nindent 8 }}
@@ -139,15 +139,27 @@ spec:
139139
value: {{ .Values.codetogether.timeZone.region | quote }}
140140
{{- end }}
141141

142+
{{- if and .Values.intelsecret.enabled (not .Values.intelsecret.ref) }}
143+
{{- fail "intelsecret.enabled=true requires intelsecret.ref (existing Secret name)" -}}
144+
{{- end }}
145+
142146
- name: CT_INTEL_URL
143147
valueFrom:
144148
secretKeyRef:
145-
name: {{ include "codetogether.fullname" . }}-intel
149+
name: {{ if .Values.intelsecret.enabled -}}
150+
{{ .Values.intelsecret.ref | quote }}
151+
{{- else }}
152+
{{ printf "%s-intel" (include "codetogether.fullname" .) | quote }}
153+
{{- end }}
146154
key: url
147155
- name: CT_INTEL_SECRET
148156
valueFrom:
149157
secretKeyRef:
150-
name: {{ include "codetogether.fullname" . }}-intel
158+
name: {{ if .Values.intelsecret.enabled -}}
159+
{{ .Values.intelsecret.ref | quote }}
160+
{{- else }}
161+
{{ printf "%s-intel" (include "codetogether.fullname" .) | quote }}
162+
{{- end }}
151163
key: secret
152164
{{- if .Values.dashboard.enabled }}
153165
- name: CT_DASHBOARD_USER

charts/collab/templates/secret-intel.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if not .Values.intelsecret.enabled }}
12
apiVersion: v1
23
kind: Secret
34
metadata:
@@ -8,3 +9,4 @@ type: Opaque
89
data:
910
url: {{ .Values.intel.url | b64enc | quote }}
1011
secret: {{ .Values.intel.secret | b64enc | quote }}
12+
{{- end }}

charts/collab/values.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ imageCredentials:
3737
openshift:
3838
enabled: false
3939

40+
# Optional: use an existing secret for Intel connection
41+
intelsecret:
42+
enabled: false # default OFF - chart-managed secret
43+
ref: "" # name of existing Secret (must have keys: url, secret)
44+
4045
#
4146
# Values required for establishing connection with the Intel server.
4247
#

0 commit comments

Comments
 (0)