From 37a25762201423ebc97d9acb70179a2d0e3f938a Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 21 Mar 2024 13:31:46 +0100
Subject: [PATCH] OZG-5238 Avoid Problem
---
src/main/helm/templates/_helpers.tpl | 6 ++----
src/test/helm/deployment_defaults_sso_test.yaml | 3 +--
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index 46172ed4..1bbdc15d 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -60,10 +60,8 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{- end -}}
{{- define "app.ssoClientName" -}}
-{{- if ( .Values.sso).keycloak_clients -}}
-{{- with (first .Values.sso.keycloak_clients) }}
-{{ printf "%s" .client_name }}
-{{- end }}
+{{- if (.Values.sso).client_name -}}
+{{ printf "%s" (.Values.sso).client_name }}
{{- else -}}
{{ printf "admin" }}
{{- end -}}
diff --git a/src/test/helm/deployment_defaults_sso_test.yaml b/src/test/helm/deployment_defaults_sso_test.yaml
index 78c0ceef..d5e91d30 100644
--- a/src/test/helm/deployment_defaults_sso_test.yaml
+++ b/src/test/helm/deployment_defaults_sso_test.yaml
@@ -75,8 +75,7 @@ tests:
- it: check different client name
set:
sso:
- keycloak_clients:
- - client_name: different-client
+ client_name: different-client
asserts:
- isKind:
of: Deployment
--
GitLab