From c2bd5bc7f515f935d7a92870ac7718ea1d197336 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 19 Jun 2024 14:35:00 +0200
Subject: [PATCH] ozg-564 add use new user manager ingress parameter
---
src/main/helm/templates/_helpers.tpl | 2 ++
.../helm/deployment_usermanager_address_env_test.yaml | 9 +++++++++
2 files changed, 11 insertions(+)
diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index 2277556ced..6e5cbc71da 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -64,6 +64,8 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{- define "app.ozgcloud_user-manager_url" -}}
{{- if (.Values).usermanagerUrl -}}
{{ printf "%s" (.Values).usermanagerUrl }}
+{{- else if (.Values).useNewUserManagerIngress -}}
+{{ printf "https://%s.%s/user-manager" (include "app.ozgcloudBezeichner" .) (include "app.baseUrl" .) }}
{{- else -}}
{{ printf "https://%s-%s.%s" (include "app.ozgcloudBezeichner" .) .Values.usermanagerName (include "app.baseUrl" .) }}
{{- end -}}
diff --git a/src/test/helm/deployment_usermanager_address_env_test.yaml b/src/test/helm/deployment_usermanager_address_env_test.yaml
index 028e532557..338ad50fc6 100644
--- a/src/test/helm/deployment_usermanager_address_env_test.yaml
+++ b/src/test/helm/deployment_usermanager_address_env_test.yaml
@@ -56,3 +56,12 @@ tests:
content:
name: ozgcloud_user-manager_url
value: http://test.domain.local
+ - it: should use new usermanager url
+ set:
+ useNewUserManagerIngress: true
+ asserts:
+ - contains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: ozgcloud_user-manager_url
+ value: https://helm.test.company.local/user-manager
--
GitLab