Skip to content
Snippets Groups Projects
Commit c2bd5bc7 authored by OZGCloud's avatar OZGCloud
Browse files

ozg-564 add use new user manager ingress parameter

parent aea52b8f
No related branches found
No related tags found
No related merge requests found
...@@ -64,6 +64,8 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }} ...@@ -64,6 +64,8 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{- define "app.ozgcloud_user-manager_url" -}} {{- define "app.ozgcloud_user-manager_url" -}}
{{- if (.Values).usermanagerUrl -}} {{- if (.Values).usermanagerUrl -}}
{{ printf "%s" (.Values).usermanagerUrl }} {{ printf "%s" (.Values).usermanagerUrl }}
{{- else if (.Values).useNewUserManagerIngress -}}
{{ printf "https://%s.%s/user-manager" (include "app.ozgcloudBezeichner" .) (include "app.baseUrl" .) }}
{{- else -}} {{- else -}}
{{ printf "https://%s-%s.%s" (include "app.ozgcloudBezeichner" .) .Values.usermanagerName (include "app.baseUrl" .) }} {{ printf "https://%s-%s.%s" (include "app.ozgcloudBezeichner" .) .Values.usermanagerName (include "app.baseUrl" .) }}
{{- end -}} {{- end -}}
......
...@@ -56,3 +56,12 @@ tests: ...@@ -56,3 +56,12 @@ tests:
content: content:
name: ozgcloud_user-manager_url name: ozgcloud_user-manager_url
value: http://test.domain.local 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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment