From 14092b311c1ca118ea468ea42f6dfd2514f98f4f Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 25 Jan 2024 09:36:34 +0100
Subject: [PATCH] OZG-3880 network-policy fix xta dns config
---
xta-adapter/src/main/helm/templates/network_policy.yaml | 5 +----
xta-adapter/src/main/helm/test-values.yaml | 4 ++++
xta-adapter/src/test/helm/network_policy_test.yaml | 9 +++++----
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/xta-adapter/src/main/helm/templates/network_policy.yaml b/xta-adapter/src/main/helm/templates/network_policy.yaml
index ff4602138..af39de580 100644
--- a/xta-adapter/src/main/helm/templates/network_policy.yaml
+++ b/xta-adapter/src/main/helm/templates/network_policy.yaml
@@ -45,10 +45,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/xta-adapter/src/main/helm/test-values.yaml b/xta-adapter/src/main/helm/test-values.yaml
index 7b0b2d9b7..61f944220 100644
--- a/xta-adapter/src/main/helm/test-values.yaml
+++ b/xta-adapter/src/main/helm/test-values.yaml
@@ -26,3 +26,7 @@ ozgcloud:
environment: test
bezeichner: helm
bundesland: by
+
+
+networkPolicy:
+ dnsServerNamespace: test-dns-server-namespace
\ No newline at end of file
diff --git a/xta-adapter/src/test/helm/network_policy_test.yaml b/xta-adapter/src/test/helm/network_policy_test.yaml
index 99d1fade5..9ef79112e 100644
--- a/xta-adapter/src/test/helm/network_policy_test.yaml
+++ b/xta-adapter/src/test/helm/network_policy_test.yaml
@@ -27,6 +27,9 @@ release:
namespace: by-helm-test
templates:
- templates/network_policy.yaml
+set:
+ networkPolicy:
+ dnsServerNamespace: test-dns-namespace
tests:
- it: should match apiVersion
asserts:
@@ -64,10 +67,7 @@ tests:
- to:
- namespaceSelector:
matchLabels:
- kubernetes.io/metadata.name: kube-system
- podSelector:
- matchLabels:
- k8s-app: kube-dns
+ kubernetes.io/metadata.name: test-dns-namespace
ports:
- port: 53
protocol: UDP
@@ -117,6 +117,7 @@ tests:
set:
networkPolicy:
disabled: false
+ dnsServerNamespace: test-dns-namespace
asserts:
- hasDocuments:
count: 1
\ No newline at end of file
--
GitLab