wrenix/helm-charts
1
0
Fork 0
Code Issues 8 Pull requests 2 Projects Packages Activity

Add support for extraSecretEnvironmentVars and plain env: values #108

Closed
pat-s wants to merge 6 commits from extraSecretEnvironmentVars into main
pull from: extraSecretEnvironmentVars
merge into: wrenix:main
Conversation 5 Commits 6 Files changed 2 +17
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 49108fed46 - Show all commits

15
ntfy/templates/_helpers.tpl
View file

@ -60,3 +60,18 @@ Create the name of the service account to use
{{- default "default" .Values.serviceAccount.name }} {{- default "default" .Values.serviceAccount.name }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{/*
Inject extra environment populated by secrets, if populated
*/}}
{{- define "ntfy.extraSecretEnvironmentVars" -}}
{{- if .extraSecretEnvironmentVars -}}
{{- range .extraSecretEnvironmentVars }}
- name: {{ .envName }}
valueFrom:
secretKeyRef:
name: {{ .secretName }}
key: {{ .secretKey }}
{{- end -}}
{{- end -}}
{{- end -}}

2
ntfy/templates/deployment.yaml
View file

@ -38,6 +38,8 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default (printf "v%s" .Chart.AppVersion) }}" image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default (printf "v%s" .Chart.AppVersion) }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
args: [ "serve" ] args: [ "serve" ]
env:
{{- include "ntfy.extraSecretEnvironmentVars" . | nindent 12 }}
envFrom: envFrom:
- configMapRef: - configMapRef:
name: {{ include "ntfy.fullname" . }}-env name: {{ include "ntfy.fullname" . }}-env