Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions charts/collab/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
annotations:
checksum/coturn: {{ include (print $.Template.BasePath "/secret-coturn.yaml") . | sha256sum }}
checksum/dashboard: {{ include (print $.Template.BasePath "/secret-dashboard.yaml") . | sha256sum }}
checksum/intel: {{ include (print $.Template.BasePath "/secret-intel.yaml") . | sha256sum }}
checksum/intel: {{- if not .Values.intelsecret.enabled }} {{ include (print $.Template.BasePath "/secret-intel.yaml") . | sha256sum }} {{- else }} "external" {{- end }}
checksum/ssl: {{ include (print $.Template.BasePath "/secret-ssl.yaml") . | sha256sum }}
{{- with .Values.podAnnotations }}
{{- toYaml . | nindent 8 }}
Expand Down Expand Up @@ -139,15 +139,27 @@ spec:
value: {{ .Values.codetogether.timeZone.region | quote }}
{{- end }}

{{- if and .Values.intelsecret.enabled (not .Values.intelsecret.ref) }}
{{- fail "intelsecret.enabled=true requires intelsecret.ref (existing Secret name)" -}}
{{- end }}

- name: CT_INTEL_URL
valueFrom:
secretKeyRef:
name: {{ include "codetogether.fullname" . }}-intel
name: {{ if .Values.intelsecret.enabled -}}
{{ .Values.intelsecret.ref | quote }}
{{- else }}
{{ printf "%s-intel" (include "codetogether.fullname" .) | quote }}
{{- end }}
key: url
- name: CT_INTEL_SECRET
valueFrom:
secretKeyRef:
name: {{ include "codetogether.fullname" . }}-intel
name: {{ if .Values.intelsecret.enabled -}}
{{ .Values.intelsecret.ref | quote }}
{{- else }}
{{ printf "%s-intel" (include "codetogether.fullname" .) | quote }}
{{- end }}
key: secret
{{- if .Values.dashboard.enabled }}
- name: CT_DASHBOARD_USER
Expand Down
2 changes: 2 additions & 0 deletions charts/collab/templates/secret-intel.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if not .Values.intelsecret.enabled }}
apiVersion: v1
kind: Secret
metadata:
Expand All @@ -8,3 +9,4 @@ type: Opaque
data:
url: {{ .Values.intel.url | b64enc | quote }}
secret: {{ .Values.intel.secret | b64enc | quote }}
{{- end }}
5 changes: 5 additions & 0 deletions charts/collab/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ imageCredentials:
openshift:
enabled: false

# Optional: use an existing secret for Intel connection
intelsecret:
enabled: false # default OFF - chart-managed secret
ref: "" # name of existing Secret (must have keys: url, secret)

#
# Values required for establishing connection with the Intel server.
#
Expand Down
Loading