OZG-3034 OZG-6684 Set required values in helm test suites

src/main/helm/templates/_helpers.tpl

@@ -50,7 +50,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end -}}
 
 {{- define "app.ozgcloudEnvironment" -}}
-{{- required "ozgcloud.environment muss angegeben sein" (.Values.ozgcloud).environment -}}
+{{- required "ozgcloud.environment must be set" (.Values.ozgcloud).environment -}}
 {{- end -}}
 
 {{- define "app.vorgangManagerDatabase" -}}

src/main/helm/values.yaml

@@ -24,8 +24,6 @@
 
 cluster_env: ""
 
-baseUrl: test.sh.ozg-cloud.de
-
 replicaCount: 2
 
 # ozgcloud:

src/test/helm/deployment_63_chars_test.yaml

@@ -33,8 +33,10 @@ chart:
 templates:
   - templates/deployment.yaml
 set:
+  baseUrl: test.sh.ozg-cloud.de
   ozgcloud:
     environment: dev
+    bezeichner: helm
   imagePullSecret: test-image-pull-secret
 
 tests:

src/test/helm/deployment_actuator_test.yaml

@@ -29,8 +29,10 @@ release:
 templates:
   - templates/deployment.yaml
 set:
+  baseUrl: test.sh.ozg-cloud.de
   ozgcloud:
     environment: dev
+    bezeichner: helm
   imagePullSecret: test-image-pull-secret
 tests:
   - it: check readiness and startup probe

src/test/helm/deployment_administration_address_env_test.yaml

@@ -29,9 +29,11 @@ release:
 templates:
   - templates/deployment.yaml
 set:
+  baseUrl: test.sh.ozg-cloud.de
   ozgcloud:
     environment: dev
-  imagePullSecret: image-pull-secret
+    bezeichner: helm
+  imagePullSecret: test-image-pull-secret
 tests:
   - it: should have set administration server address
     set:

src/test/helm/deployment_alfa_host_test.yaml

@@ -29,21 +29,19 @@ 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 alfa host
-    set:
-      baseUrl: test.company.local
-      ozgcloud:
-        bezeichner: helm
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
           content:
             name: ozgcloud_alfa_host
-            value: https://helm.test.company.local
+            value: https://helm.test.sh.ozg-cloud.de
   - it: should use alfa host from values
     set:
       alfaHost: https://hamburg.mein-kreis.de
@@ -53,19 +51,3 @@ tests:
           content:
             name: ozgcloud_alfa_host
             value: https://hamburg.mein-kreis.de
-  - it: should fail if bezeichner is not set
-    set:
-      baseUrl: test.company.local
-      ozgcloud:
-        bezeichner:
-    asserts:
-      - failedTemplate:
-          errorMessage: "ozgcloud.bezeichner must be set"
-  - it: should fail if base url is not set
-    set:
-      baseUrl:
-      ozgcloud:
-        bezeichner: helm
-    asserts:
-      - failedTemplate:
-          errorMessage: "baseUrl must be set"

src/test/helm/deployment_antragraum_test.yaml

@@ -29,9 +29,11 @@ release:
 templates:
   - templates/deployment.yaml
 set:
-  imagePullSecret: image-pull-secret
+  baseUrl: test.sh.ozg-cloud.de
   ozgcloud:
     environment: dev
+    bezeichner: helm
+  imagePullSecret: test-image-pull-secret
 tests:
   - it: should set antragsraum values
     set:

src/test/helm/deployment_bayernid_test.yaml

@@ -29,8 +29,10 @@ 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 bayernid values

src/test/helm/deployment_bindings_test.yaml

@@ -29,8 +29,10 @@ 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 have volumes

src/test/helm/deployment_container_basic_test.yaml

@@ -29,8 +29,10 @@ 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 have correct values for container image, name, imagePullPolicy

src/test/helm/deployment_container_security_context_test.yaml

@@ -29,8 +29,10 @@ release:
 templates:
   - templates/deployment.yaml
 set:
+  baseUrl: test.sh.ozg-cloud.de
   ozgcloud:
     environment: dev
+    bezeichner: helm
   imagePullSecret: test-image-pull-secret
 tests:
   - it: check default values

src/test/helm/deployment_defaults_labels_test.yaml

@@ -29,8 +29,10 @@ release:
 templates:
   - templates/deployment.yaml
 set:
+  baseUrl: test.sh.ozg-cloud.de
   ozgcloud:
     environment: dev
+    bezeichner: helm
   imagePullSecret: test-image-pull-secret
 tests:
   - it: check default labels

src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml

@@ -29,8 +29,10 @@ release:
 templates:
   - templates/deployment.yaml
 set:
+  baseUrl: test.sh.ozg-cloud.de
   ozgcloud:
-    environment: test
+    environment: dev
+    bezeichner: helm
   imagePullSecret: test-image-pull-secret
  
 tests:

src/test/helm/deployment_dummy_bescheid_document_test.yaml

@@ -29,12 +29,14 @@ release:
 templates:
   - templates/deployment.yaml
 set:
-  imagePullSecret: image-pull-secret
+  baseUrl: test.sh.ozg-cloud.de
   ozgcloud:
     environment: dev
+    bezeichner: helm
     feature:
       bescheid:
         enableDummyDocumentProcessor: true
+  imagePullSecret: image-pull-secret
 tests:
   - it: should enable dummy bescheid document processor
     asserts:

src/test/helm/deployment_elasticsearch_test.yaml

@@ -26,8 +26,13 @@ suite: elasticsearch tests
 templates:
   - templates/deployment.yaml
 set:
+  baseUrl: test.sh.ozg-cloud.de
   ozgcloud:
     environment: dev
+    bezeichner: helm
+    feature:
+      bescheid:
+        enableDummyDocumentProcessor: true
   imagePullSecret: test-image-pull-secret
 tests:
   - it: check if elastic credentials are disabled by default

src/test/helm/deployment_env_test.yaml

@@ -26,8 +26,10 @@ suite: test environments
 templates:
   - templates/deployment.yaml
 set:
+  baseUrl: test.sh.ozg-cloud.de
   ozgcloud:
     environment: dev
+    bezeichner: helm
   imagePullSecret: test-image-pull-secret
 tests:
   - it: check customList as list

src/test/helm/deployment_grpc_info_manager_address_test.yaml

@@ -28,14 +28,18 @@ release:
   namespace: sh-helm-test
 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 grpc info-manager client address
     set:
       ozgcloud:
-        environment: dev
         infoManager:
           address: https://info-manager.my-wonderful-domain.local:9000
-      imagePullSecret: test-image-pull-secret
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env

src/test/helm/deployment_grpc_tls_test.yaml

@@ -29,8 +29,10 @@ release:
 templates:
   - templates/deployment.yaml
 set:
+  baseUrl: test.sh.ozg-cloud.de
   ozgcloud:
-    environment: test
+    environment: dev
+    bezeichner: helm
   imagePullSecret: test-image-pull-secret
 tests:
   - it: should have volume for grpc-tls-cert

src/test/helm/deployment_grpc_user_manager_address_test.yaml

@@ -29,8 +29,10 @@ 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 grpc user-manager client address

src/test/helm/deployment_host_aliases_test.yaml

@@ -29,8 +29,10 @@ 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 not set hostAliases