Merge pull request 'ReleaseFix' (#481) from ReleaseFix into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/vorgang-manager/pulls/481


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

src/main/helm/templates/_helpers.tpl

@@ -77,6 +77,22 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{ printf "http://%s.%s:8080" .Values.administrationName .Release.Namespace }}
 {{- end -}}
 
+{{- define "app.getApplicationAddress" -}}
+{{- if .Values.applicationAddress -}}
+{{  .Values.applicationAddress }}
+{{- else -}}
+{{ printf "dns:///%s.%s:9090" .Values.vorgangmanagerName .Release.Namespace }}
+{{- end -}}
+{{- end -}}
+
+{{- define "app.getNachrichtenManagerAddress" -}}
+{{- if .Values.nachrichtenManagerAddress -}}
+{{  .Values.nachrichtenManagerAddress }}
+{{- else -}}
+{{ printf "%s.%s:9090" .Values.vorgangmanagerName .Release.Namespace }}
+{{- end -}}
+{{- end -}}
+
 {{- define "app.databaseSecretName" -}}
 {{- if (.Values.database).secretName -}}
 {{  .Values.database.secretName }}

src/main/helm/templates/deployment.yaml

@@ -64,9 +64,9 @@ spec:
           - name: spring_profiles_active
             value: {{ include "app.envSpringProfiles" . }}
           - name: ozgcloud_application_address
-            value: {{ include "app.ozgcloud_vorgangmanager_address" . }}
+            value: {{ include "app.getApplicationAddress" . }}
           - name: ozgcloud_nachrichten-manager_address
-            value: {{ include "app.ozgcloud_vorgangmanager_address" . }}
+            value: {{ include "app.getNachrichtenManagerAddress" . }}
           {{- if .Values.env.ozgcloudAktenzeichen.enabled }}
           - name: ozgcloud_aktenzeichen
             value: {{ .Values.env.ozgcloudAktenzeichen.value | default "de.ozgcloud.vorgang.vorgang.AktenzeichenProviderEA" }}

src/test/helm/deployment_nachrichten_manager_address_test.yaml

@@ -22,23 +22,34 @@
 # unter der Lizenz sind dem Lizenztext zu entnehmen.
 #
 
-suite: test environments nachrichten-manager_url
+suite: deployment nachrichten-manager_url
 release:
   name: vorgang-manager
-  namespace: sh-helm-test
+  namespace: by-helm-test
 templates:
   - templates/deployment.yaml
 set:
-  baseUrl: test.sh.ozg-cloud.de
+  baseUrl: test.by.ozg-cloud.de
   ozgcloud:
     environment: dev
     bezeichner: helm
   imagePullSecret: test-image-pull-secret
 tests:
-  - it: check if nachrichten-manager address is correct
+  - it: should generate nachrichten-manager address if not exists
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
           content:
             name: ozgcloud_nachrichten-manager_address
-            value:  dns:///vorgang-manager.sh-helm-test:9090
+            value:  vorgang-manager.by-helm-test:9090
+
+  - it: should have set nachrichten-manager address
+    set:
+      nachrichtenManagerAddress: localSettedAddress
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ozgcloud_nachrichten-manager_address
+            value:  localSettedAddress
+  
\ No newline at end of file

src/test/helm/deployment_vorgang_manager_env_test.yaml

@@ -35,10 +35,20 @@ set:
     bezeichner: helm
   imagePullSecret: test-image-pull-secret
 tests:
-  - it: check if application address is set
+  - it: should generate application address if its not set
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
           content:
             name: ozgcloud_application_address
             value: dns:///vorgang-manager.by-helm-test:9090
+            
+  - it: should keep application address if its set
+    set:
+      applicationAddress: localSettedAddress
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ozgcloud_application_address
+            value: localSettedAddress
\ No newline at end of file

vorgang-manager-server/pom.xml

@@ -55,9 +55,9 @@
 		<user-manager-interface.version>2.9.0</user-manager-interface.version>
 		<bescheid-manager.version>1.20.0-SNAPSHOT</bescheid-manager.version>
 		<processor-manager.version>0.4.1</processor-manager.version>
-		<nachrichten-manager.version>2.12.0</nachrichten-manager.version>
+		<nachrichten-manager.version>2.12.1</nachrichten-manager.version>
 		<ozgcloud-starter.version>0.12.0</ozgcloud-starter.version>
-		<notification-manager.version>2.11.0</notification-manager.version>
+		<notification-manager.version>2.11.1</notification-manager.version>
 		<collaboration-manager.version>0.3.0</collaboration-manager.version>
 
 		<zip.version>2.11.1</zip.version>