use values directly

camunda · Jun 13, 2024 · 4ad6ca6 · 4ad6ca6
1 parent 34b917d
commit 4ad6ca6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/charts/camunda-platform-latest/templates/console/_helpers.tpl b/charts/camunda-platform-latest/templates/console/_helpers.tpl
@@ -63,18 +63,3 @@ Get the image pull secrets.
         "context" $
     ) -}}
 {{- end }}
-
-{{/*
-[console] Define variables related to authentication.
-*/}}
-{{- define "console.authClientId" -}}
-  {{- .Values.global.identity.auth.console.clientId -}}
-{{- end -}}
-
-{{- define "console.authAudience" -}}
-  {{- .Values.global.identity.auth.console.clientApiAudience -}}
-{{- end -}}
-
-{{- define "console.authWellKnown" -}}
-  {{- .Values.global.identity.auth.console.wellKnown -}}
-{{- end -}}
diff --git a/charts/camunda-platform-latest/templates/console/configmap.yaml b/charts/camunda-platform-latest/templates/console/configmap.yaml
@@ -14,12 +14,12 @@ data:
     camunda:
       console:
         oAuth:
-          clientId: {{ include "console.authClientId" . | quote }}
+          clientId: {{ .Values.global.identity.auth.console.clientId | quote }}
           issuer: {{ include "camundaPlatform.authIssuerUrl" . | quote }}
-          audience: {{ include "console.authAudience" . | quote }}
+          audience: {{ .Values.global.identity.auth.console.clientApiAudience | quote }}
           jwksUri: {{ include "camundaPlatform.authIssuerBackendUrlCertsEndpoint" . | quote }}
           type: {{ include "camundaPlatform.authType" . | quote }}
-          wellKnown: {{ include "console.authWellKnown" . | quote }}
+          wellKnown: {{ .Values.global.identity.auth.console.wellKnown | quote }}
         managed:
           method: plain
           releases: