From 5d5ff76541510b36f2535737dda5fc32d410a713 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 24 Jan 2024 09:34:10 +0100
Subject: [PATCH] OZG-3880 network-policy add incoming from vorgangmanager, add
additionalRules
---
src/main/helm/templates/network_policy.yaml | 17 ++++++--
src/test/helm/network_policy_test.yaml | 47 +++++++++++++++------
2 files changed, 48 insertions(+), 16 deletions(-)
diff --git a/src/main/helm/templates/network_policy.yaml b/src/main/helm/templates/network_policy.yaml
index 63f1e646..867dfcd8 100644
--- a/src/main/helm/templates/network_policy.yaml
+++ b/src/main/helm/templates/network_policy.yaml
@@ -37,10 +37,15 @@ spec:
ingress:
- ports:
- port: 8080
- {{- with (.Values.networkPolicy).additionalIngressConfig }}
- - from:
-{{ toYaml . | indent 8 }}
- {{- end }}
+ - ports:
+ - port: 9090
+ from:
+ - podSelector:
+ matchLabels:
+ component: user-manager
+{{- with (.Values.networkPolicy).additionalIngressConfig }}
+{{ toYaml . | indent 2 }}
+{{- end }}
egress:
- to:
- podSelector:
@@ -66,5 +71,9 @@ spec:
protocol: UDP
- port: 5353
protocol: TCP
+{{- with (.Values.networkPolicy).additionalEgressConfig }}
+{{ toYaml . | indent 2 }}
+{{- end }}
+
{{- end }}
diff --git a/src/test/helm/network_policy_test.yaml b/src/test/helm/network_policy_test.yaml
index d28baa40..180147c4 100644
--- a/src/test/helm/network_policy_test.yaml
+++ b/src/test/helm/network_policy_test.yaml
@@ -61,6 +61,12 @@ tests:
ingress:
- ports:
- port: 8080
+ - ports:
+ - port: 9090
+ from:
+ - podSelector:
+ matchLabels:
+ component: user-manager
egress:
- to:
- podSelector:
@@ -86,25 +92,42 @@ tests:
protocol: UDP
- port: 5353
protocol: TCP
+
- it: add ingress rule by values
set:
networkPolicy:
ssoPublicIp: 51.89.117.53/32
dnsServerNamespace: test-namespace-dns
additionalIngressConfig:
- - podSelector:
- matchLabels:
- component: client2
+ - from:
+ - podSelector:
+ matchLabels:
+ component: client2
asserts:
- - equal:
+ - contains:
path: spec.ingress
- value:
- - ports:
- - port: 8080
- - from:
- - podSelector:
- matchLabels:
- component: client2
+ content:
+ from:
+ - podSelector:
+ matchLabels:
+ component: client2
+
+ - it: add egress rules by values
+ set:
+ networkPolicy:
+ ssoPublicIp: 51.89.117.53/32
+ dnsServerNamespace: test-dns-namespace
+ additionalEgressConfig:
+ - to:
+ - ipBlock:
+ cidr: 1.2.3.4/32
+ asserts:
+ - contains:
+ path: spec.egress
+ content:
+ to:
+ - ipBlock:
+ cidr: 1.2.3.4/32
- it: test network policy disabled
set:
@@ -114,7 +137,7 @@ tests:
- hasDocuments:
count: 0
- - it: test network policy unset should be disabled
+ - it: should generate network policies on disabled:false
set:
networkPolicy:
disabled: false
--
GitLab