From 13d4db7b94d4c689e11b44900715d71afffac411 Mon Sep 17 00:00:00 2001
From: Bastian <bastian.heppener@mgm-tp.com>
Date: Mon, 14 Apr 2025 12:18:12 +0200
Subject: [PATCH] ozg-8078 adjust zufi-manager address
---
src/main/helm/templates/deployment.yaml | 2 +-
src/main/helm/templates/network_policy.yaml | 2 +-
src/main/helm/values.yaml | 1 +
src/test/helm/deployment_63_char_test.yaml | 3 +-
...ment_archive_manager_address_env_test.yaml | 2 +
src/test/helm/deployment_bindings_test.yaml | 2 +
.../deployment_collaboration_env_test.yaml | 60 +-----------
...ollaboration_manager_address_env_test.yaml | 2 +
.../deployment_config_client_env_test.yaml | 2 +
.../helm/deployment_customList_env_test.yaml | 2 +
.../deployment_defaults_affinity_test.yaml | 2 +
.../helm/deployment_defaults_env_test.yaml | 2 +
.../helm/deployment_defaults_labels_test.yaml | 2 +
..._defaults_spec_containers_health_test.yaml | 2 +
..._spec_containers_securityContext_test.yaml | 2 +
...loyment_defaults_spec_containers_test.yaml | 2 +
.../deployment_defaults_sso_env_test.yaml | 2 +
...faults_topologySpreadConstraints_test.yaml | 2 +
.../helm/deployment_host_aliases_test.yaml | 2 +
src/test/helm/deployment_imageTag_test.yaml | 2 +
.../deployment_imagepull_secret_test.yaml | 2 +
.../helm/deployment_liveness_probe_test.yaml | 2 +
...ployment_pod_default_spec_values_test.yaml | 2 +
src/test/helm/deployment_resources_test.yaml | 2 +
.../deployment_springProfile_env_test.yaml | 2 +
src/test/helm/deployment_upload_env_test.yaml | 2 +
...ployment_usermanager_address_env_test.yaml | 2 +
...ment_vorgang_manager_address_env_test.yaml | 2 +
.../deployment_zufi_manager_address_test.yaml | 91 +++++++++++++++++++
...t_general_value_and_default_spec_test.yaml | 2 +
src/test/helm/network_policy_test.yaml | 47 ++++++++--
31 files changed, 186 insertions(+), 68 deletions(-)
create mode 100644 src/test/helm/deployment_zufi_manager_address_test.yaml
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index a0c14d08bd..6e291f05c6 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -121,7 +121,7 @@ spec:
{{- end}}
- name: ozgcloud_administration_address
value: {{ include "app.spring_cloud_config_administration_address" . }}
-{{- if ((.Values.ozgcloud).feature).collaborationEnabled }}
+{{- if (.Values.zufiManager).enabled }}
- name: grpc_client_zufi-manager_address
value: {{ include "app.grpcClientZufiServerAddress" . }}
- name: grpc_client_zufi-manager_negotiationType
diff --git a/src/main/helm/templates/network_policy.yaml b/src/main/helm/templates/network_policy.yaml
index f1e383bf84..62ac1eed6c 100644
--- a/src/main/helm/templates/network_policy.yaml
+++ b/src/main/helm/templates/network_policy.yaml
@@ -52,7 +52,7 @@ spec:
{{ toYaml . | indent 2 }}
{{- end }}
egress:
-{{- if ((.Values.ozgcloud).feature).collaborationEnabled }}
+{{- if (.Values.zufiManager).enabled }}
- to:
- namespaceSelector:
matchLabels:
diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml
index f096912a36..3cdd73bddf 100644
--- a/src/main/helm/values.yaml
+++ b/src/main/helm/values.yaml
@@ -32,6 +32,7 @@ replicaCount: 2 # [default: 2]
usermanagerName: user-manager
zufiManager:
+ enabled: true
serverName: zufi-server
# env:
diff --git a/src/test/helm/deployment_63_char_test.yaml b/src/test/helm/deployment_63_char_test.yaml
index e4f54aa404..f4fb109181 100644
--- a/src/test/helm/deployment_63_char_test.yaml
+++ b/src/test/helm/deployment_63_char_test.yaml
@@ -42,7 +42,8 @@ set:
serverUrl: https://sso.company.local
baseUrl: test.company.local
imagePullSecret: image-pull-secret
-
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: should not fail on .Release.Namespace length less than 63 characters
asserts:
diff --git a/src/test/helm/deployment_archive_manager_address_env_test.yaml b/src/test/helm/deployment_archive_manager_address_env_test.yaml
index 62c21c0178..364fdaf1b7 100644
--- a/src/test/helm/deployment_archive_manager_address_env_test.yaml
+++ b/src/test/helm/deployment_archive_manager_address_env_test.yaml
@@ -38,6 +38,8 @@ set:
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: should set the archive-manager name
set:
diff --git a/src/test/helm/deployment_bindings_test.yaml b/src/test/helm/deployment_bindings_test.yaml
index 1a97acbf75..a0394d7bb9 100644
--- a/src/test/helm/deployment_bindings_test.yaml
+++ b/src/test/helm/deployment_bindings_test.yaml
@@ -38,6 +38,8 @@ set:
serverUrl: https://sso.company.local
baseUrl: test.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: should have volume mounts
set:
diff --git a/src/test/helm/deployment_collaboration_env_test.yaml b/src/test/helm/deployment_collaboration_env_test.yaml
index 5c3f8cffca..4e7d8a392b 100644
--- a/src/test/helm/deployment_collaboration_env_test.yaml
+++ b/src/test/helm/deployment_collaboration_env_test.yaml
@@ -38,31 +38,11 @@ set:
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: namespace
tests:
- - it: should set zufi server address
- set:
- zufiManager:
- namespace: namespace
- ozgcloud:
- feature:
- collaborationEnabled: true
- asserts:
- - contains:
- path: spec.template.spec.containers[0].env
- content:
- name: grpc_client_zufi-manager_address
- value: dns:///zufi-server.namespace:9090
- - it: should not set zufi server address
- asserts:
- - notContains:
- path: spec.template.spec.containers[0].env
- content:
- name: grpc_client_zufi-manager_address
- any: true
- it: should enable collaboration
set:
- zufiManager:
- namespace: namespace
ozgcloud:
feature:
collaborationEnabled: true
@@ -78,38 +58,4 @@ tests:
path: spec.template.spec.containers[0].env
content:
name: ozgcloud_feature_collaborationEnabled
- any: true
- - it: should set negotiation type
- set:
- zufiManager:
- namespace: namespace
- grpcClientNegotiationType: PLAINTEXT
- ozgcloud:
- feature:
- collaborationEnabled: true
- asserts:
- - contains:
- path: spec.template.spec.containers[0].env
- content:
- name: grpc_client_zufi-manager_negotiationType
- value: PLAINTEXT
- - it: negotiation type is TLS in standard
- set:
- zufiManager:
- namespace: namespace
- ozgcloud:
- feature:
- collaborationEnabled: true
- asserts:
- - contains:
- path: spec.template.spec.containers[0].env
- content:
- name: grpc_client_zufi-manager_negotiationType
- value: TLS
- - it: should not set negotiation type
- asserts:
- - notContains:
- path: spec.template.spec.containers[0].env
- content:
- name: grpc_client_zufi-manager_negotiationType
- any: true
+ any: true
\ No newline at end of file
diff --git a/src/test/helm/deployment_collaboration_manager_address_env_test.yaml b/src/test/helm/deployment_collaboration_manager_address_env_test.yaml
index 2d1d4f2ce1..44d1c63132 100644
--- a/src/test/helm/deployment_collaboration_manager_address_env_test.yaml
+++ b/src/test/helm/deployment_collaboration_manager_address_env_test.yaml
@@ -38,6 +38,8 @@ set:
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: should set the collaboration-manager name
set:
diff --git a/src/test/helm/deployment_config_client_env_test.yaml b/src/test/helm/deployment_config_client_env_test.yaml
index 22160f51c4..62b739f82e 100644
--- a/src/test/helm/deployment_config_client_env_test.yaml
+++ b/src/test/helm/deployment_config_client_env_test.yaml
@@ -38,6 +38,8 @@ set:
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: namespace
tests:
- it: should set default administration server address
asserts:
diff --git a/src/test/helm/deployment_customList_env_test.yaml b/src/test/helm/deployment_customList_env_test.yaml
index 747718c308..fc915abd7f 100644
--- a/src/test/helm/deployment_customList_env_test.yaml
+++ b/src/test/helm/deployment_customList_env_test.yaml
@@ -35,6 +35,8 @@ set:
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: check customList as list
set:
diff --git a/src/test/helm/deployment_defaults_affinity_test.yaml b/src/test/helm/deployment_defaults_affinity_test.yaml
index f6f74091d4..bd3b479262 100644
--- a/src/test/helm/deployment_defaults_affinity_test.yaml
+++ b/src/test/helm/deployment_defaults_affinity_test.yaml
@@ -38,6 +38,8 @@ set:
serverUrl: https://sso.company.local
baseUrl: test.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: should work
asserts:
diff --git a/src/test/helm/deployment_defaults_env_test.yaml b/src/test/helm/deployment_defaults_env_test.yaml
index fd21432a90..26a0ae99fb 100644
--- a/src/test/helm/deployment_defaults_env_test.yaml
+++ b/src/test/helm/deployment_defaults_env_test.yaml
@@ -37,6 +37,8 @@ set:
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: check default values
set:
diff --git a/src/test/helm/deployment_defaults_labels_test.yaml b/src/test/helm/deployment_defaults_labels_test.yaml
index 4a17358666..3c2f205a62 100644
--- a/src/test/helm/deployment_defaults_labels_test.yaml
+++ b/src/test/helm/deployment_defaults_labels_test.yaml
@@ -39,6 +39,8 @@ set:
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: check default labels
asserts:
diff --git a/src/test/helm/deployment_defaults_spec_containers_health_test.yaml b/src/test/helm/deployment_defaults_spec_containers_health_test.yaml
index b794b72cdc..269cd60555 100644
--- a/src/test/helm/deployment_defaults_spec_containers_health_test.yaml
+++ b/src/test/helm/deployment_defaults_spec_containers_health_test.yaml
@@ -38,6 +38,8 @@ set:
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: should have correct valaues for health check
asserts:
diff --git a/src/test/helm/deployment_defaults_spec_containers_securityContext_test.yaml b/src/test/helm/deployment_defaults_spec_containers_securityContext_test.yaml
index 76c0fb55c3..65d680c659 100644
--- a/src/test/helm/deployment_defaults_spec_containers_securityContext_test.yaml
+++ b/src/test/helm/deployment_defaults_spec_containers_securityContext_test.yaml
@@ -38,6 +38,8 @@ set:
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: check default values
asserts:
diff --git a/src/test/helm/deployment_defaults_spec_containers_test.yaml b/src/test/helm/deployment_defaults_spec_containers_test.yaml
index 4a09b1cdef..013048663d 100644
--- a/src/test/helm/deployment_defaults_spec_containers_test.yaml
+++ b/src/test/helm/deployment_defaults_spec_containers_test.yaml
@@ -38,6 +38,8 @@ set:
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: check for some standard values
asserts:
diff --git a/src/test/helm/deployment_defaults_sso_env_test.yaml b/src/test/helm/deployment_defaults_sso_env_test.yaml
index e64213f66e..9bcc89a060 100644
--- a/src/test/helm/deployment_defaults_sso_env_test.yaml
+++ b/src/test/helm/deployment_defaults_sso_env_test.yaml
@@ -38,6 +38,8 @@ set:
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: check default values
asserts:
diff --git a/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml b/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml
index f89897b050..b493cc6060 100644
--- a/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml
+++ b/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml
@@ -38,6 +38,8 @@ set:
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: check default values
asserts:
diff --git a/src/test/helm/deployment_host_aliases_test.yaml b/src/test/helm/deployment_host_aliases_test.yaml
index 42caa76552..39f10bac28 100644
--- a/src/test/helm/deployment_host_aliases_test.yaml
+++ b/src/test/helm/deployment_host_aliases_test.yaml
@@ -38,6 +38,8 @@ set:
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: should not set hostAliases
asserts:
diff --git a/src/test/helm/deployment_imageTag_test.yaml b/src/test/helm/deployment_imageTag_test.yaml
index 883f93ea58..0003d69770 100644
--- a/src/test/helm/deployment_imageTag_test.yaml
+++ b/src/test/helm/deployment_imageTag_test.yaml
@@ -38,6 +38,8 @@ set:
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: should set the latest imageTag
set:
diff --git a/src/test/helm/deployment_imagepull_secret_test.yaml b/src/test/helm/deployment_imagepull_secret_test.yaml
index 3a7972b0fc..dec791804c 100644
--- a/src/test/helm/deployment_imagepull_secret_test.yaml
+++ b/src/test/helm/deployment_imagepull_secret_test.yaml
@@ -37,6 +37,8 @@ set:
barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: should set the imagePull secret
set:
diff --git a/src/test/helm/deployment_liveness_probe_test.yaml b/src/test/helm/deployment_liveness_probe_test.yaml
index 78f9912ff3..25c1b01b2b 100644
--- a/src/test/helm/deployment_liveness_probe_test.yaml
+++ b/src/test/helm/deployment_liveness_probe_test.yaml
@@ -38,6 +38,8 @@ set:
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: livenessProbe should be disabled by default
template: deployment.yaml
diff --git a/src/test/helm/deployment_pod_default_spec_values_test.yaml b/src/test/helm/deployment_pod_default_spec_values_test.yaml
index 32ae31e9d6..ce200b9df0 100644
--- a/src/test/helm/deployment_pod_default_spec_values_test.yaml
+++ b/src/test/helm/deployment_pod_default_spec_values_test.yaml
@@ -38,6 +38,8 @@ set:
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: should have correct pod template values
asserts:
diff --git a/src/test/helm/deployment_resources_test.yaml b/src/test/helm/deployment_resources_test.yaml
index ced5244c86..c01c3575e2 100644
--- a/src/test/helm/deployment_resources_test.yaml
+++ b/src/test/helm/deployment_resources_test.yaml
@@ -37,6 +37,8 @@ set:
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: test resources
set:
diff --git a/src/test/helm/deployment_springProfile_env_test.yaml b/src/test/helm/deployment_springProfile_env_test.yaml
index 075e2d7b3f..bb42933048 100644
--- a/src/test/helm/deployment_springProfile_env_test.yaml
+++ b/src/test/helm/deployment_springProfile_env_test.yaml
@@ -38,6 +38,8 @@ set:
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: should override the spring profiles
set:
diff --git a/src/test/helm/deployment_upload_env_test.yaml b/src/test/helm/deployment_upload_env_test.yaml
index b0791698b1..bd3e314647 100644
--- a/src/test/helm/deployment_upload_env_test.yaml
+++ b/src/test/helm/deployment_upload_env_test.yaml
@@ -38,6 +38,8 @@ set:
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: should set upload values
set:
diff --git a/src/test/helm/deployment_usermanager_address_env_test.yaml b/src/test/helm/deployment_usermanager_address_env_test.yaml
index fdcd6d45a6..7bf15d38fe 100644
--- a/src/test/helm/deployment_usermanager_address_env_test.yaml
+++ b/src/test/helm/deployment_usermanager_address_env_test.yaml
@@ -38,6 +38,8 @@ set:
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: should build the usermanager url for test environment
set:
diff --git a/src/test/helm/deployment_vorgang_manager_address_env_test.yaml b/src/test/helm/deployment_vorgang_manager_address_env_test.yaml
index 905ae5162a..a9da8d4d17 100644
--- a/src/test/helm/deployment_vorgang_manager_address_env_test.yaml
+++ b/src/test/helm/deployment_vorgang_manager_address_env_test.yaml
@@ -38,6 +38,8 @@ set:
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: should set the vorgang-manager name
set:
diff --git a/src/test/helm/deployment_zufi_manager_address_test.yaml b/src/test/helm/deployment_zufi_manager_address_test.yaml
new file mode 100644
index 0000000000..052fdf46d1
--- /dev/null
+++ b/src/test/helm/deployment_zufi_manager_address_test.yaml
@@ -0,0 +1,91 @@
+#
+# Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+suite: deployment zufi-manager address
+release:
+ name: alfa
+ namespace: sh-helm-test
+templates:
+ - templates/deployment.yaml
+set:
+ baseUrl: test.company.local
+ ozgcloud:
+ environment: test
+ bundesland: sh
+ bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
+ sso:
+ serverUrl: https://sso.company.local
+ imagePullSecret: image-pull-secret
+tests:
+ - it: should set zufi server address
+ set:
+ zufiManager:
+ namespace: namespace
+ asserts:
+ - contains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: grpc_client_zufi-manager_address
+ value: dns:///zufi-server.namespace:9090
+ - it: should not enable zufi-manager address
+ set:
+ zufiManager:
+ enabled: false
+ asserts:
+ - notContains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: grpc_client_zufi-manager_address
+ any: true
+ - notContains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: grpc_client_zufi-manager_negotiationType
+ any: true
+ - it: should set negotiation type
+ set:
+ zufiManager:
+ namespace: namespace
+ grpcClientNegotiationType: PLAINTEXT
+ asserts:
+ - contains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: grpc_client_zufi-manager_negotiationType
+ value: PLAINTEXT
+ - it: negotiation type is TLS in standard
+ set:
+ zufiManager:
+ namespace: namespace
+ asserts:
+ - contains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: grpc_client_zufi-manager_negotiationType
+ value: TLS
+ - it: should require zufi-manager namespace
+ asserts:
+ - failedTemplate:
+ errorMessage: zufiManager.namespace must be set if zufiManager server is enabled
\ No newline at end of file
diff --git a/src/test/helm/deyploment_general_value_and_default_spec_test.yaml b/src/test/helm/deyploment_general_value_and_default_spec_test.yaml
index b22a8c5ec0..475f606f18 100644
--- a/src/test/helm/deyploment_general_value_and_default_spec_test.yaml
+++ b/src/test/helm/deyploment_general_value_and_default_spec_test.yaml
@@ -38,6 +38,8 @@ set:
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
+ zufiManager:
+ namespace: by-zufi-dev
tests:
- it: should have correct apiVersion
diff --git a/src/test/helm/network_policy_test.yaml b/src/test/helm/network_policy_test.yaml
index 8d61ef9515..574b804463 100644
--- a/src/test/helm/network_policy_test.yaml
+++ b/src/test/helm/network_policy_test.yaml
@@ -35,6 +35,8 @@ tests:
networkPolicy:
dnsServerNamespace: kube-system
ssoPublicIp: 1.1.1.1/32
+ zufiManager:
+ namespace: by-zufi-dev
asserts:
- isAPIVersion:
of: networking.k8s.io/v1
@@ -44,6 +46,8 @@ tests:
networkPolicy:
dnsServerNamespace: kube-system
ssoPublicIp: 1.1.1.1/32
+ zufiManager:
+ namespace: by-zufi-dev
asserts:
- isKind:
of: NetworkPolicy
@@ -52,6 +56,8 @@ tests:
networkPolicy:
dnsServerNamespace: kube-system
ssoPublicIp: 1.1.1.1/32
+ zufiManager:
+ namespace: by-zufi-dev
asserts:
- equal:
path: metadata
@@ -63,6 +69,8 @@ tests:
networkPolicy:
dnsServerNamespace: kube-system
ssoPublicIp: 1.1.1.1/32
+ zufiManager:
+ namespace: by-zufi-dev
asserts:
- equal:
path: spec
@@ -84,6 +92,16 @@ tests:
- port: 8081
protocol: TCP
egress:
+ - to:
+ - namespaceSelector:
+ matchLabels:
+ kubernetes.io/metadata.name: by-zufi-dev
+ podSelector:
+ matchLabels:
+ component: zufi-server
+ ports:
+ - port: 9090
+ protocol: TCP
- to:
- podSelector:
matchLabels:
@@ -133,6 +151,8 @@ tests:
- podSelector:
matchLabels:
component: client2
+ zufiManager:
+ namespace: by-zufi-dev
asserts:
- contains:
path: spec.ingress
@@ -151,6 +171,8 @@ tests:
- podSelector:
matchLabels:
component: client2
+ zufiManager:
+ namespace: by-zufi-dev
asserts:
- contains:
path: spec.ingress
@@ -169,6 +191,8 @@ tests:
- to:
- ipBlock:
cidr: 1.2.3.4/32
+ zufiManager:
+ namespace: by-zufi-dev
asserts:
- contains:
path: spec.egress
@@ -185,6 +209,8 @@ tests:
- to:
- ipBlock:
cidr: 1.2.3.4/32
+ zufiManager:
+ namespace: by-zufi-dev
asserts:
- contains:
path: spec.egress
@@ -207,6 +233,8 @@ tests:
ssoPublicIp: 1.1.1.1
disabled: false
dnsServerNamespace: test-dns-server-namespace
+ zufiManager:
+ namespace: by-zufi-dev
asserts:
- hasDocuments:
count: 1
@@ -216,6 +244,8 @@ tests:
networkPolicy:
disabled: false
ssoPublicIp: 1.1.1.1/32
+ zufiManager:
+ namespace: by-zufi-dev
asserts:
- failedTemplate:
errorMessage: networkPolicy.dnsServerNamespace must be set
@@ -226,6 +256,8 @@ tests:
networkPolicy:
disabled: false
dnsServerNamespace: test-dns-server-namespace
+ zufiManager:
+ namespace: by-zufi-dev
asserts:
- failedTemplate:
errorMessage: networkPolicy.ssoPublicIp must be set
@@ -235,22 +267,22 @@ tests:
networkPolicy:
ssoPublicIp: 1.1.1.1
dnsServerNamespace: test-dns-server-namespace
+ zufiManager:
+ namespace: by-zufi-dev
asserts:
- hasDocuments:
count: 1
- - it: should set egress for zufi if configured
+ - it: should not set egress for zufi if zufi-manager ist disabled
set:
networkPolicy:
ssoPublicIp: 1.1.1.1
dnsServerNamespace: test-dns-server-namespace
- ozgcloud:
- feature:
- collaborationEnabled: true
zufiManager:
+ enabled: false
namespace: by-zufi-dev
asserts:
- - contains:
+ - notContains:
path: spec.egress
content:
to:
@@ -268,9 +300,6 @@ tests:
networkPolicy:
ssoPublicIp: 1.1.1.1
dnsServerNamespace: test-dns-server-namespace
- ozgcloud:
- feature:
- collaborationEnabled: true
asserts:
- failedTemplate:
errorMessage: zufiManager.namespace must be set if zufiManager server is enabled
@@ -280,6 +309,8 @@ tests:
ssoPublicIp: 1.1.1.1
dnsServerNamespace: test-dns-server-namespace
monitoringNamespace: test-monitoring
+ zufiManager:
+ namespace: by-zufi-dev
asserts:
- contains:
path: spec.ingress
--
GitLab