Merge branch 'master' into OZG-6720-signatur-bearbeiten

src/main/helm/templates/deployment.yaml

@@ -104,6 +104,10 @@ spec:
           - name: ozgcloud_administration_sync_organisationseinheiten_cron
             value: {{ .Values.ozgcloud.sync.organisationseinheiten.cron | quote }}
           {{- end }}
+          - name: grpc_client_zufi-manager_address
+            value: {{ .Values.zufiManager.address }}
+          - name: grpc_client_zufi-manager_negotiationType
+            value: {{ (.Values.zufiManager).grpcClientNegotiationType | default "TLS" }}
         envFrom:
           {{- if (.Values.database).useExternal }}
           - secretRef:

src/main/helm/templates/network_policy.yaml

@@ -29,9 +29,12 @@ spec:
 {{- end }}
   egress:
     - to:
-        - podSelector:
+        - namespaceSelector:
             matchLabels:
-              component: zufi-server
+              kubernetes.io/metadata.name: "zufi"
+          podSelector:
+            matchLabels:
+              component: "zufi-server"
       ports:
         - port: 9090
           protocol: TCP

src/main/helm/values.yaml

@@ -33,6 +33,9 @@ ozgcloud:
     api:
       user: administrationApiUser
 
+zufiManager:
+  address: zufi-server.zufi:9090
+
 image:
   repo: docker.ozg-sh.de
   name: administration

src/main/resources/application.yaml

@@ -88,5 +88,5 @@ ozgcloud:
 grpc:
   client:
     zufi-manager:
-      address: static://127.0.0.1:9190
+      address: static://127.0.0.1:9090
       negotiationType: TLS
\ No newline at end of file

src/test/helm/network_policy_test.yaml

@@ -84,16 +84,19 @@ tests:
                   port: 8081
             egress:
               - to:
-                  - podSelector:
+                  - namespaceSelector:
+                      matchLabels:
+                        kubernetes.io/metadata.name: "zufi"
+                    podSelector:
                       matchLabels:
-                        component: zufi-server
+                        component: "zufi-server"
                 ports:
                   - port: 9090
                     protocol: TCP
               - to:
                   - podSelector:
                       matchLabels:
-                        component: ozgcloud-mongodb
+                        component: "ozgcloud-mongodb"
                 ports:
                   - port: 27017
                     protocol: TCP