From cf8feb231c6f172f3c7234c65b5003b705b73666 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 9 Dec 2024 11:02:53 +0100
Subject: [PATCH] OZG-7131 remove fachstelle host default value
---
src/main/helm/templates/_helpers.tpl | 6 +----
.../helm/deployment_fachstelle_host_test.yaml | 24 ++++---------------
2 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index e1125f31d..b75130090 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -166,11 +166,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{- define "app.fachstelleHost" -}}
{{- if (.Values.fachstelle).enabled -}}
-{{- if (.Values.fachstelle).host -}}
-{{ (.Values.fachstelle).host | quote }}
-{{- else -}}
-{{ printf "https://fachstelle.%s" (include "app.baseUrl" .) }}
-{{- end -}}
+{{- required "fachstelle.host must be set" .Values.fachstelle.host | quote }}
{{- end -}}
{{- end -}}
diff --git a/src/test/helm/deployment_fachstelle_host_test.yaml b/src/test/helm/deployment_fachstelle_host_test.yaml
index 2c22d73b9..1e7335c3b 100644
--- a/src/test/helm/deployment_fachstelle_host_test.yaml
+++ b/src/test/helm/deployment_fachstelle_host_test.yaml
@@ -29,26 +29,14 @@ release:
templates:
- templates/deployment.yaml
set:
+ baseUrl: test.sh.ozg-cloud.de
ozgcloud:
environment: dev
bezeichner: helm
imagePullSecret: test-image-pull-secret
tests:
- - it: should set the fachstelle host
+ - it: should set fachstelle host
set:
- baseUrl: test.sh.ozg-cloud.de
- fachstelle:
- enabled: true
- asserts:
- - contains:
- path: spec.template.spec.containers[0].env
- content:
- name: ozgcloud_fachstelle_host
- value: https://fachstelle.test.sh.ozg-cloud.de
-
- - it: should use fachstelle host from values
- set:
- baseUrl: test.sh.ozg-cloud.de
fachstelle:
enabled: true
host: https://hamburg.mein-kreis.de
@@ -58,16 +46,14 @@ tests:
content:
name: ozgcloud_fachstelle_host
value: https://hamburg.mein-kreis.de
- - it: should fail if base url is not set
+ - it: should fail if host url is not set
set:
fachstelle:
enabled: true
asserts:
- failedTemplate:
- errorMessage: "baseUrl must be set"
- - it: should not fail if fachstelle is not enabled and base url is not set
- set:
- alfaHost: alfa.de
+ errorMessage: "fachstelle.host must be set"
+ - it: should not fail if fachstelle is not enabled and host is not set
asserts:
- notContains:
path: spec.template.spec.containers[0].env
--
GitLab