feat: template configmaps (#703)

ory · Sep 27, 2024 · e011f35 · e011f35
1 parent 85bc64b
commit e011f35
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 6 deletions.
diff --git a/hacks/values/hydra.yaml b/hacks/values/hydra.yaml
@@ -26,6 +26,8 @@ hydra:
         - "foo bar 123 456 lorem 1"
         - "foo bar 123 456 lorem 2"
         - "foo bar 123 456 lorem 3"
+    log:
+      redaction_text: "example template {{ .Release.Name }}"
 
 secret:
   enabled: false

diff --git a/hacks/values/keto.yaml b/hacks/values/keto.yaml
@@ -6,6 +6,8 @@ keto:
       - keto
   config:
     dsn: "postgres://postgres:ory@postgresql.default.svc.cluster.local/ory_keto?sslmode=disable&max_conn_lifetime=10s"
+    log:
+      redaction_text: "example template {{ .Release.Name }}"
 ingress:
   read:
     enabled: true

diff --git a/hacks/values/oathkeeper.yaml b/hacks/values/oathkeeper.yaml
@@ -133,6 +133,8 @@ oathkeeper:
     authenticators:
       noop:
         enabled: true
+    log:
+      redaction_text: "example template {{ .Release.Name }}"
 
 secret:
   enabled: true

diff --git a/helm/charts/hydra/templates/_helpers.tpl b/helm/charts/hydra/templates/_helpers.tpl
@@ -125,7 +125,7 @@ Generate the configmap data, redacting secrets
 */}}
 {{- define "hydra.configmap" -}}
 {{- $config := omit .Values.hydra.config "dsn" "secrets" -}}
-{{- toYaml $config -}}
+{{- tpl (toYaml $config) . -}}
 {{- end -}}
 
 {{/*

diff --git a/helm/charts/keto/templates/_helpers.tpl b/helm/charts/keto/templates/_helpers.tpl
@@ -57,7 +57,7 @@ Generate the configmap data, redacting secrets
 */}}
 {{- define "keto.configmap" -}}
 {{- $config := omit .Values.keto.config "dsn" -}}
-{{- toYaml $config -}}
+{{- tpl (toYaml $config) . -}}
 {{- end -}}
 
 {{/*

diff --git a/helm/charts/oathkeeper/templates/_helpers.tpl b/helm/charts/oathkeeper/templates/_helpers.tpl
@@ -25,6 +25,14 @@ If release name contains chart name it will be used as a full name.
 {{- end -}}
 
 
+{{/*
+Generate the configmap data, redacting secrets
+*/}}
+{{- define "oathkeeper.configmap" -}}
+{{- $config := .Values.oathkeeper.config -}}
+{{- tpl (toYaml $config) . -}}
+{{- end -}}
+
 {{/*
 Create a config map name for rules.
 If maester is enabled, use the child chart named template to get the value.

diff --git a/helm/charts/oathkeeper/templates/configmap-config.yaml b/helm/charts/oathkeeper/templates/configmap-config.yaml
@@ -11,7 +11,5 @@ metadata:
 {{ include "oathkeeper.labels" . | indent 4 }}
 data:
   "config.yaml": |
-{{- with .Values.oathkeeper.config -}}  
-  {{- toYaml . | nindent 4 }} 
-{{- end -}}
-{{ end }}
+    {{- include "oathkeeper.configmap" . | nindent 4 }}
+{{ end }}