Merge branch 'dev' into feature/OZG-6730-proxy-mandantenfaehig

src/main/helm/templates/deployment.yaml

@@ -58,12 +58,12 @@ spec:
             app.kubernetes.io/name: {{ .Release.Name }}
       containers:
       - env:
-          - name: SERVER_PORT
+          - name: HTTP_SERVER_PORT
             value: "8082"
-          - name: GRPC_MOCK
-            value: "{{ (.Values.grpc).mock | default false }}"
-          - name: GRPC_URL
-            value: "{{ required ".Values.grpc.url must be set" (.Values.grpc).url }}"
+          - name: GRPC_SERVER_MOCK
+            value: "{{ ((.Values.grpc).server).mock }}"
+          - name: GRPC_SERVER_PORT
+            value: "9090"
           {{- with include "app.getCustomList" . }}
 {{ . | indent 10 }}
           {{- end }}

src/main/helm/templates/ingress.yaml

@@ -14,7 +14,7 @@ metadata:
     cert-manager.io/cluster-issuer: letsencrypt-prod
     {{- end }}
 spec:
-  {{- if and (.Values.ingress).className (ne (.Values).cluster_env "dataport") }}
+  {{- if and (.Values.ingress).className }}
   ingressClassName: {{ .Values.ingress.className }}
   {{- end }}
   rules:
@@ -34,6 +34,6 @@ spec:
       - {{ include "app.baseDomain" . }}
       {{- if (.Values.ingress).tlsSecretName }}
       secretName: {{ (.Values.ingress).tlsSecretName }}
-      {{- else if ne (.Values).cluster_env "dataport" }}
+      {{- else }}
       secretName: {{ (.Values.ozgcloud).bezeichner }}-{{ .Release.Name }}-tls
       {{- end }}
\ No newline at end of file

src/main/helm/values.yaml

@@ -33,4 +33,6 @@ image:
 
 
 
-
+grpc:
+  server:
+    mock: false
\ No newline at end of file

src/test/helm-linter-values.yaml

@@ -4,8 +4,6 @@ networkPolicy:
   dnsServerNamespace: test-dns-namespace
 
 imagePullSecret: ozgcloud-image-pull-secret
-server:
-  port: 8080
 
 ozgcloud:
   bezeichner: antragsraum-proxy
@@ -13,4 +11,5 @@ ozgcloud:
 baseUrl: antragsraum-proxy.dev.de
 
 grpc:
-  url: vorgang-manager.de
\ No newline at end of file
+  server:
+    port: 9090
\ No newline at end of file

src/test/helm/deployment_defaults_labels_test.yaml

@@ -30,10 +30,9 @@ templates:
   - templates/deployment.yaml
 set:
   imagePullSecret: image-pull-secret
-  server:
-    port: 8080
   grpc:
-    url: "vorgang-manager.de:9090"
+    server:
+      port: 9090
 tests:
   - it: check metadata.labels
     asserts:

src/test/helm/deployment_env_test.yaml

@@ -35,8 +35,6 @@ tests:
           value: "A test value"
         - name: test_environment
           value: "B test value"
-      grpc:
-        url: "vorgang-manager.de:9090"
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
@@ -53,8 +51,6 @@ tests:
       env.customList:
         my_test_environment_name: "A test value"
         test_environment: "B test value"
-      grpc:
-        url: "vorgang-manager.de:9090"
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
@@ -67,28 +63,32 @@ tests:
             name: test_environment
             value: "B test value"
 
-  - it: check envs
-    set:       
-      grpc:
-        url: "vorgang-manager.de:9090"
+  - it: check envs default values
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
           content:
-            name: GRPC_URL
-            value: "vorgang-manager.de:9090"
+            name: GRPC_SERVER_MOCK
+            value: "false"
       - contains:
           path: spec.template.spec.containers[0].env
           content:
-            name: GRPC_MOCK
-            value: "false"
+            name: HTTP_SERVER_PORT
+            value: "8082"
       - contains:
           path: spec.template.spec.containers[0].env
           content:
-            name: SERVER_PORT
-            value: "8082"
-  - it: should fail template if grpc.url not set
+            name: GRPC_SERVER_PORT
+            value: "9090"
+
+  - it: should set GRPC_SERVER_MOCK 
     set:
+      grpc:
+        server:
+          mock: true
     asserts:
-      - failedTemplate:
-          errormessage: ".Values.grpc.url must be set"
\ No newline at end of file
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: GRPC_SERVER_MOCK
+            value: "true"
\ No newline at end of file

src/test/helm/deployment_imagepull_secret_test.yaml

@@ -29,10 +29,9 @@ release:
 templates:
   - templates/deployment.yaml
 set:
-  server:
-    port: 8080
   grpc:
-    url: "vorgang-manager.de:9090"
+    server:
+      port: 9090
 tests:
   - it: should use correct imagePull secret
     set:

src/test/helm/deployment_resources_test.yaml

@@ -29,10 +29,9 @@ templates:
   - templates/deployment.yaml
 set:
   imagePullSecret: image-pull-secret
-  server:
-    port: 8080
   grpc:
-    url: "vorgang-manager.de:9090"
+    server:
+      port: 9090
 
 tests:
   - it: should generate resources when values set

src/test/helm/deployment_test.yaml

@@ -29,10 +29,9 @@ templates:
   - templates/deployment.yaml
 set:
   imagePullSecret: image-pull-secret
-  server:
-    port: 8080
   grpc:
-    url: "vorgang-manager.de:9090"
+    server:
+      port: 9090
 
 tests:
   - it: should have metadata values

src/test/helm/ingress_tests.yaml

@@ -44,15 +44,6 @@ tests:
           path: spec.tls[0].secretName
           value: helm-antragsraum-proxy-tls
   
-  - it: should not create ingress tls/ingressClass
-    set:
-      cluster_env: dataport
-    asserts:
-      - isNull:
-          path: spec.ingressClassName
-      - isNull:
-          path: spec.tls[0].secretName
-  
   - it: should use default letsencrypt-prod cluster-issuer
     asserts:
       - equal: