Add support for extraSecretEnvironmentVars and plain env: values #108

Closed
pat-s wants to merge 6 commits from extraSecretEnvironmentVars into main
2 changed files with 32 additions and 4 deletions

View file

@ -42,9 +42,23 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default (printf "v%s" .Chart.AppVersion) }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
args: [ "serve" ]
env:
{{- with .Values.ntfy.env }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- include "ntfy.extraSecretEnvironmentVars" .Values.ntfy | nindent 12 }}
envFrom:
- configMapRef:
name: {{ include "ntfy.fullname" . }}-env
{{- if .Values.envFrom }}
{{- range .envFrom }}
- name: {{ .envName }}
valueFrom:
secretKeyRef:
name: {{ .secretName }}
key: {{ .secretKey }}
{{- end -}}
{{- end -}}
ports:
- name: http
containerPort: {{ .Values.service.http.port }}

View file

@ -14,6 +14,16 @@ imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
# - name:
# value:
env: []
# - name:
# valueFrom:
# secretKeyRef:
# name:
# key:
envFrom: []
updateStrategy:
type: Recreate
@ -144,10 +154,12 @@ serviceAccount:
podLabels: {}
podAnnotations: {}
podSecurityContext: {}
podSecurityContext:
{}
# fsGroup: 2000
securityContext: {}
securityContext:
{}
# capabilities:
# drop:
# - ALL
@ -168,7 +180,8 @@ service:
ingress:
enabled: false
className: ""
annotations: {}
annotations:
{}
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
hosts:
@ -181,7 +194,8 @@ ingress:
# hosts:
# - chart-example.local
resources: {}
resources:
{}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following