From 3b41fe0a0999114b86b5164547b0b28f4ce598b3 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 18 Dec 2023 09:04:10 +0100
Subject: [PATCH] OZG-3880 network policy dynamic dns server config

---
 src/main/helm/templates/network_policy.yaml | 5 +----
 src/test/helm/network_policy_test.yaml      | 8 ++++----
 src/test/unit-values.yaml                   | 3 ++-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/helm/templates/network_policy.yaml b/src/main/helm/templates/network_policy.yaml
index 21f80e8acc..457937b8dc 100644
--- a/src/main/helm/templates/network_policy.yaml
+++ b/src/main/helm/templates/network_policy.yaml
@@ -33,10 +33,7 @@ spec:
   - to:
     - namespaceSelector:
         matchLabels:
-          kubernetes.io/metadata.name: kube-system
-      podSelector:
-        matchLabels:
-          k8s-app: kube-dns
+          kubernetes.io/metadata.name: {{ required "networkPolicy.dnsServerNamespace must be set" (.Values.networkPolicy).dnsServerNamespace }}
     ports:
       - port: 53
         protocol: UDP
diff --git a/src/test/helm/network_policy_test.yaml b/src/test/helm/network_policy_test.yaml
index bd129d8b2f..a9e15a70d9 100644
--- a/src/test/helm/network_policy_test.yaml
+++ b/src/test/helm/network_policy_test.yaml
@@ -45,6 +45,9 @@ tests:
             name: network-policy-alfa
             namespace: by-helm-test
   - it: validate spec
+    set:
+      networkPolicy:
+        dnsServerNamespace: kube-system
     asserts:
       - equal:
           path: spec
@@ -74,9 +77,6 @@ tests:
               - namespaceSelector:
                   matchLabels:
                     kubernetes.io/metadata.name: kube-system
-                podSelector:
-                  matchLabels:
-                    k8s-app: kube-dns
               ports:
                 - port: 53
                   protocol: UDP
@@ -114,4 +114,4 @@ tests:
         disabled: false
     asserts:
       - hasDocuments:
-          count: 1
\ No newline at end of file
+          count: 1
diff --git a/src/test/unit-values.yaml b/src/test/unit-values.yaml
index e6c704ec6a..1e11128f1c 100644
--- a/src/test/unit-values.yaml
+++ b/src/test/unit-values.yaml
@@ -44,4 +44,5 @@ image:
   tag: snapshot-latest
 
 networkPolicy:
-  ssoPublicIp: 51.89.117.53/32
\ No newline at end of file
+  ssoPublicIp: 51.89.117.53/32
+  dnsServerNamespace: dummy-dns
\ No newline at end of file
-- 
GitLab