diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index a0c14d08bdd36bd36cdf19a84c36ffb31281e8ef..6e291f05c6b95410162328fc6263ace325fe2059 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 f1e383bf84bb7247521187b08ec2d3e58a02d265..62ac1eed6cc74bf497b2f06452541615c44ea2d6 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 f096912a363c18e1a932ffcc91401255a5366b6a..3cdd73bddfe1a72b4228f8c78cb6138faa7a6303 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 e4f54aa4043f30d2e29d3b0bd43af18ce39491b7..f4fb109181ac20da27fd9b501d52149cfc470bdb 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 62c21c0178121e18e317b25c107785fe6bc86a74..364fdaf1b72213624fe942f36509d57ac450c235 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 1a97acbf75dfc76a29657b0e031ff3c72a3e819c..a0394d7bb9f2731b9307e6bfce6ccf6ab2e3823f 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 5c3f8cffca25edc716ec5b20a9e78bf1d36654c5..4e7d8a392b830740d738b701472fe7167f4c1a64 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 2d1d4f2ce1668ebca72e9ea166c0e379584d31fd..44d1c631320bd135198544b2486a24cc15adc768 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 22160f51c47ae09585a6a9ec76895d536d53cd6c..62b739f82e3c870fd1fa22db7c41b577da57304e 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 747718c3086265f3f7fa0279f1be4f3cbd16445e..fc915abd7f5296b080ad613e3c56c576c0d72a7c 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 f6f74091d43288639d332c800f4076fc857ca4ee..bd3b479262f8afc2023093225037efbc4f4a5876 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 fd21432a9058b93a040dfb93d732b8d2ada51b85..26a0ae99fba0e8158e078e68ad265a6156e27b86 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 4a173586663da27ef10943810af89033747cc021..3c2f205a627d91e64a657e450d2cb25285a5032f 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 b794b72cdcbdca2426a579b5369c4716639d2967..269cd60555c43ddead1e0694fb189143d8e1fb78 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 76c0fb55c3a19cb36a101657f7d75dd5e8851788..65d680c659dd3a79ae6e35e43842ee06b9318667 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 4a09b1cdef7539b6d4fb44a53d0d02bf2df30a9c..013048663db0402fda132c7f56b557cc95ab6d89 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 e64213f66ec1af7f2bb97626431513ba23c622ca..9bcc89a0606048eba1b839ed355ea3ecd1a4eace 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 f89897b0503e14346d0b518166829067209ade5c..b493cc6060e3c1437b85a29dbda8a380d951c4a2 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 42caa76552fc17d74de41b6b9a344180d9005837..39f10bac28be85a2c8baaf9edbec0c84b66b4a84 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 883f93ea580f320165c1a655b70fbd5d64fca0a4..0003d69770922343018656bd22844e88c4f0a882 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 3a7972b0fc3f59305aabef90e3f359b81f09a0d7..dec791804ccf8b7363ba94f2320e29a1e65860b7 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 78f9912ff33fa920866124af06f5bf35bb00d353..25c1b01b2b5a1308bdcde098cce10986b74db37b 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 32ae31e9d60ae995e8b39526c54876fa063e17fc..ce200b9df025f0468593a818c24a2b170435d047 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 ced5244c8602a69e86f9a68a511422c851422ab3..c01c3575e2f2856983ab7e2468f872cd0844cb3f 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 075e2d7b3fb0837ee5041da019c973c093dc6732..bb429330489041b079ae43fe8e9bf0f021c791e3 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 b0791698b17b5ca94efebbcb2b831d2fe163626a..bd3e314647414fa31ac88b560dbf129f9f46063f 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 fdcd6d45a6de7deed49c9d1fe25bf909d157ab09..7bf15d38fe46d5acb8ab85c62f29a7dd71dc3fc8 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 905ae5162abb166d730d410a4813afbf5b155c3f..a9da8d4d17f121ea10f0c92d46b426c108fb7d20 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 0000000000000000000000000000000000000000..052fdf46d1964c8a0aaed823417fbed795a4545d
--- /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 b22a8c5ec095bfb0c7985665f1baab40c492ce91..475f606f18e03f8dbb1a5c24933beae35fd96356 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 8d61ef951565b2b768f23bbbe5060a7013eced42..574b8044633119d117aa8f7c9b381e415b867e0e 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