Skip to content

fix: actually implement rendered config map and secrets #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: actually implement rendered config map and secrets #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1089579
implement the rendered secrets and configmaps and conditionally mount…
ianmuge Aug 26, 2025
ff1351c
fix some identified mismatch in values
ianmuge Aug 26, 2025
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
30 changes: 30 additions & 0 deletions charts/keep/templates/backend-configs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{{- if .Values.backend.envRenderSecret }}
---
apiVersion: v1
kind: Secret
metadata:
name: {{ include "keep.fullname" . }}-backend-env-secret
labels:
{{- include "keep.labels" . | nindent 4 }}
app.kubernetes.io/component: backend
type: Opaque
stringData:
{{- range $key, $value := .Values.backend.envRenderSecret }}
{{ $key }}: {{ (tpl $value .) | quote }}
{{- end }}
{{- end }}

{{- if .Values.backend.envRender }}
---
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "keep.fullname" . }}-backend-env
labels:
{{- include "keep.labels" . | nindent 4 }}
app.kubernetes.io/component: backend
data:
{{- range $key, $value := .Values.backend.envRender }}
{{ $key }}: {{ (tpl $value .) | quote }}
{{- end }}
{{- end }}
12 changes: 11 additions & 1 deletion charts/keep/templates/backend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ spec:
# Force reload on provision changes
checksum/provision-providers: {{ .Values.backend.provision.providers | toYaml | sha256sum }}
checksum/provision-workflows: {{ .Values.backend.provision.workflows | toYaml | sha256sum }}
{{- if .Values.backend.envRender }}
checksum/backend-env: {{ .Values.backend.envRender | toYaml | sha256sum }}
{{- end }}
{{- if .Values.backend.envRenderSecret }}
checksum/backend-env-secret: {{ .Values.backend.envRenderSecret | toYaml | sha256sum }}
{{- end }}
{{- range $key, $value := .Values.backend.podAnnotations }}
{{- if kindIs "string" $value }}
{{ $key }}: {{ tpl $value $ | quote }}
Expand Down Expand Up @@ -108,7 +114,7 @@ spec:
name: {{ .Values.backend.databaseConnectionStringFromSecret.secretName }}
key: {{ .Values.backend.databaseConnectionStringFromSecret.secretKey }}
{{- end }}
{{- if or .Values.backend.provision.providers .Values.backend.envFromSecret (or .Values.backend.envRenderSecret .Values.backend.envFromSecrets) .Values.backend.envFromConfigMaps }}
{{- if or .Values.backend.provision.providers .Values.backend.envFromSecret (or .Values.backend.envRenderSecret .Values.backend.envFromSecrets) .Values.backend.envFromConfigMaps .Values.backend.envRender }}
envFrom:
{{- if .Values.backend.provision.providers }}
- secretRef:
Expand All @@ -120,6 +126,10 @@ spec:
{{- end }}
{{- if .Values.backend.envRenderSecret }}
- secretRef:
name: {{ include "keep.fullname" . }}-backend-env-secret
{{- end }}
{{- if .Values.backend.envRender }}
- configMapRef:
name: {{ include "keep.fullname" . }}-backend-env
{{- end }}
{{- range .Values.backend.envFromSecrets }}
Expand Down
30 changes: 30 additions & 0 deletions charts/keep/templates/frontend-configs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{{- if .Values.frontend.envRenderSecret }}
---
apiVersion: v1
kind: Secret
metadata:
name: {{ include "keep.fullname" . }}-frontend-env-secret
labels:
{{- include "keep.labels" . | nindent 4 }}
app.kubernetes.io/component: frontend
type: Opaque
stringData:
{{- range $key, $value := .Values.frontend.envRenderSecret }}
{{ $key }}: {{ (tpl $value .) | quote }}
{{- end }}
{{- end }}

{{- if .Values.frontend.envRender }}
---
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "keep.fullname" . }}-frontend-env
labels:
{{- include "keep.labels" . | nindent 4 }}
app.kubernetes.io/component: frontend
data:
{{- range $key, $value := .Values.frontend.envRender }}
{{ $key }}: {{ (tpl $value .) | quote }}
{{- end }}
{{- end }}
18 changes: 15 additions & 3 deletions charts/keep/templates/frontend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,17 @@ spec:
keep-component: frontend
template:
metadata:
{{- with .Values.frontend.podAnnotations }}
{{- if or .Values.frontend.podAnnotations .Values.frontend.envRender .Values.frontend.envRenderSecret }}
annotations:
{{- if .Values.frontend.envRender }}
checksum/frontend-env: {{ .Values.frontend.envRender | toYaml | sha256sum }}
{{- end }}
{{- if .Values.frontend.envRenderSecret }}
checksum/frontend-env-secret: {{ .Values.frontend.envRenderSecret | toYaml | sha256sum }}
{{- end }}
{{- with .Values.frontend.podAnnotations }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
labels:
{{- include "keep.labels" . | nindent 8 }}
Expand Down Expand Up @@ -66,14 +74,18 @@ spec:
value: {{ .value | quote }}
{{- end }}
{{- end }}
{{- if or .Values.frontend.envFromSecret (or .Values.frontend.envRenderSecret .Values.frontend.envFromSecrets) .Values.frontend.envFromConfigMaps }}
{{- if or .Values.frontend.envFromSecret (or .Values.frontend.envRenderSecret .Values.frontend.envFromSecrets) .Values.frontend.envFromConfigMaps .Values.frontend.envRender }}
envFrom:
{{- if .Values.frontend.envFromSecret }}
- secretRef:
name: {{ tpl .Values.frontend.envFromSecret . }}
{{- end }}
{{- if .Values.frontend.envRenderSecret }}
- secretRef:
name: {{ include "keep.fullname" . }}-frontend-env-secret
{{- end }}
{{- if .Values.frontend.envRender }}
- configMapRef:
name: {{ include "keep.fullname" . }}-frontend-env
{{- end }}
{{- range .Values.frontend.envFromSecrets }}
Expand Down Expand Up @@ -112,7 +124,7 @@ spec:
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.backend.topologySpreadConstraints }}
{{- with .Values.frontend.topologySpreadConstraints }}
topologySpreadConstraints:
{{- toYaml . | nindent 8 }}
{{- end }}
Expand Down
6 changes: 5 additions & 1 deletion charts/keep/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ backend:
# -- Sensible environment variables will be rendered as a new secret object; escape {{ in secret values to avoid Helm interpretation.
envRenderSecret: {}

# -- Sensible environment variables will be rendered as a new configmap object; escape {{ in secret values to avoid Helm interpretation.
envRender: {}

# -- List of secrets to include. Must include name and can be marked as optional.
envFromSecrets: []
# - name: keep-secret-name
Expand Down Expand Up @@ -259,7 +262,8 @@ frontend:
value: "true"
# -- Name of the secret to include
envFromSecret: ""

# -- Sensible environment variables will be rendered as a new configmap object; escape {{ in secret values to avoid Helm interpretation.
envRender: {}
# -- Sensible environment variables will be rendered as a new secret object; escape {{ in secret values to avoid Helm interpretation.
envRenderSecret: {}

Expand Down
Loading