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

Merge pull request 'add ingress adapter bezeichner' (#75) from variabler-adapter-host into master

parents ff696f4a f26dad36
No related branches found
No related tags found
No related merge requests found
...@@ -71,7 +71,9 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }} ...@@ -71,7 +71,9 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{- end -}} {{- end -}}
{{- define "app.ingress.host" }} {{- define "app.ingress.host" }}
{{- if eq (.Values.image).name "formsolutions-adapter" }} {{- if (.Values.ingress).adapterBezeichner }}
{{- printf "%s-%s.%s" (include "app.kopBezeichner" .) .Values.ingress.adapterBezeichner .Values.baseUrl }}
{{- else if eq (.Values.image).name "formsolutions-adapter" }}
{{- printf "%s-fs.%s" (include "app.kopBezeichner" .) .Values.baseUrl }} {{- printf "%s-fs.%s" (include "app.kopBezeichner" .) .Values.baseUrl }}
{{- else if eq (.Values.image).name "formcycle-adapter" }} {{- else if eq (.Values.image).name "formcycle-adapter" }}
{{- printf "%s-formcycle.%s" (include "app.kopBezeichner" .) .Values.baseUrl }} {{- printf "%s-formcycle.%s" (include "app.kopBezeichner" .) .Values.baseUrl }}
......
...@@ -92,6 +92,17 @@ tests: ...@@ -92,6 +92,17 @@ tests:
value: helm-formcycle.test.sh.ozg-cloud.de value: helm-formcycle.test.sh.ozg-cloud.de
- it: should create custom adapter host
set:
ingress.adapterBezeichner: test
asserts:
- equal:
path: spec.rules[0].host
value: helm-test.test.sh.ozg-cloud.de
- equal:
path: spec.tls[0].hosts[0]
value: helm-test.test.sh.ozg-cloud.de
- it: should use letsencrypt-prod cluster-issuer as default - it: should use letsencrypt-prod cluster-issuer as default
asserts: asserts:
- equal: - equal:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment