From 788a623ad5a1c2f73ea5a15605d81d0504f3565c Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Thu, 29 Feb 2024 13:00:46 +0100 Subject: [PATCH] OZG-4939 More adjustments to match alfa --- src/main/helm/templates/keycloak-client-crd.yaml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/helm/templates/keycloak-client-crd.yaml b/src/main/helm/templates/keycloak-client-crd.yaml index 031db6e5..11bf81cb 100644 --- a/src/main/helm/templates/keycloak-client-crd.yaml +++ b/src/main/helm/templates/keycloak-client-crd.yaml @@ -9,9 +9,20 @@ metadata: spec: keep_after_delete: {{ (.Values.sso).keep_after_delete | default false }} client_name: {{ $client.client_name }} +{{- if $client.client_base_url }} + client_base_url: {{ $client.client_base_url }} +{{- else }} client_base_url: https://{{ include "app.baseDomain" $ }} +{{- end }} +{{- if $client.client_web_origins }} + client_web_origins: + {{- with $client.client_web_origins }} +{{ toYaml . | indent 4 }} + {{- end }} +{{- else }} client_web_origins: - https://{{ include "app.baseDomain" $ }} +{{- end }} client_redirect_uris: - https://{{ include "app.baseDomain" $ }} - https://{{ include "app.baseDomain" $ }}/* @@ -20,10 +31,11 @@ spec: {{ toYaml . | indent 4 }} {{- end }} {{- end }} - {{- if ((.Values.sso).keycloak_clients).client_roles }} + {{- if $client.client_roles }} client_roles: - {{- with ((.Values.sso).keycloak_clients).client_roles }} + {{- with $client.client_roles }} {{ toYaml . | indent 4 }} {{- end }} {{- end }} +{{ end }} {{- end -}} \ No newline at end of file -- GitLab