From 56a2534c6dbda2daf1820a14355434d973039b51 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Mon, 7 Oct 2024 13:29:20 +0200 Subject: [PATCH] OZG-3034 OZG-6684 Make bezeichner and baseUrl required --- src/main/helm/templates/_helpers.tpl | 12 +++++++-- src/main/helm/templates/deployment.yaml | 3 --- src/test/helm/deployment_alfa_host_test.yaml | 26 +++++--------------- 3 files changed, 16 insertions(+), 25 deletions(-) diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl index c87e1565c..71ec25b49 100644 --- a/src/main/helm/templates/_helpers.tpl +++ b/src/main/helm/templates/_helpers.tpl @@ -132,10 +132,18 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }} {{- required "elsterTransferOperator.namespace must be set" (.Values.elsterTransferOperator).namespace -}} {{- end -}} +{{- define "app.ozgcloudBezeichner" -}} +{{- required "ozgcloud.bezeichner must be set" (.Values.ozgcloud).bezeichner -}} +{{- end -}} + +{{- define "app.baseUrl" -}} +{{- required "baseUrl must be set" .Values.baseUrl }} +{{- end -}} + {{- define "app.alfaHost" -}} {{- if .Values.alfaHost -}} {{ .Values.alfaHost | quote }} -{{- else if and (.Values.ozgcloud).bezeichner .Values.baseUrl -}} -{{ print "https://" (.Values.ozgcloud).bezeichner "." .Values.baseUrl | quote }} +{{- else -}} +{{ printf "https://%s.%s" (include "app.ozgcloudBezeichner" .) (include "app.baseUrl" .) }} {{- end -}} {{- end -}} diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml index e5995fb3d..65b3f7d20 100644 --- a/src/main/helm/templates/deployment.yaml +++ b/src/main/helm/templates/deployment.yaml @@ -263,11 +263,8 @@ spec: value: "false" {{- end }} - {{- $alfaHost := (include "app.alfaHost" .) -}} - {{- if $alfaHost }} - name: ozgcloud_alfa_host value: {{ include "app.alfaHost" . }} - {{- end }} - name: ozgcloud_vorgangManager_serviceAddress value: {{ include "app.ozgcloud_vorgangmanager_address" . }} diff --git a/src/test/helm/deployment_alfa_host_test.yaml b/src/test/helm/deployment_alfa_host_test.yaml index 37a6fdd0b..7cd54cace 100644 --- a/src/test/helm/deployment_alfa_host_test.yaml +++ b/src/test/helm/deployment_alfa_host_test.yaml @@ -53,33 +53,19 @@ tests: content: name: ozgcloud_alfa_host value: https://hamburg.mein-kreis.de - - it: should not set alfa host if bezeichner is not set + - it: should fail if bezeichner is not set set: baseUrl: test.company.local ozgcloud: bezeichner: asserts: - - notContains: - path: spec.template.spec.containers[0].env - content: - name: ozgcloud_alfa_host - - it: should not set alfa host if base url is not set + - failedTemplate: + errorMessage: "ozgcloud.bezeichner must be set" + - it: should fail if base url is not set set: baseUrl: ozgcloud: bezeichner: helm asserts: - - notContains: - path: spec.template.spec.containers[0].env - content: - name: ozgcloud_alfa_host - - it: should not set alfa host if both bezeichner and base url are not set - set: - baseUrl: - ozgcloud: - bezeichner: - asserts: - - notContains: - path: spec.template.spec.containers[0].env - content: - name: ozgcloud_alfa_host + - failedTemplate: + errorMessage: "baseUrl must be set" -- GitLab