From d8a4aea9bc5dfe83f1151bc659f28944ea7e4f28 Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Mon, 13 May 2024 21:51:11 +0000
Subject: [PATCH] Revert "support CoreDNS use host network and config dns port
(#10617)" (#11185)
This reverts commit bc5b38a77127de126bd35175862414367102e1bf.
---
roles/kubernetes-apps/ansible/defaults/main.yml | 2 --
.../kubernetes-apps/ansible/templates/coredns-config.yml.j2 | 2 +-
.../ansible/templates/coredns-deployment.yml.j2 | 5 ++---
roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2 | 2 --
4 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/roles/kubernetes-apps/ansible/defaults/main.yml b/roles/kubernetes-apps/ansible/defaults/main.yml
index cb2317b1e..726e7fc21 100644
--- a/roles/kubernetes-apps/ansible/defaults/main.yml
+++ b/roles/kubernetes-apps/ansible/defaults/main.yml
@@ -16,8 +16,6 @@ coredns_ordinal_suffix: ""
coredns_deployment_nodeselector: "kubernetes.io/os: linux"
coredns_default_zone_cache_block: |
cache 30
-coredns_host_network: false
-coredns_port: 53
coredns_pod_disruption_budget: false
# value for coredns pdb
diff --git a/roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2 b/roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2
index 587a4e65d..8a4811937 100644
--- a/roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2
@@ -34,7 +34,7 @@ data:
}
{% endfor %}
{% endif %}
- .:{{ coredns_port }} {
+ .:53 {
{% if coredns_additional_configs is defined %}
{{ coredns_additional_configs | indent(width=8, first=False) }}
{% endif %}
diff --git a/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2 b/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
index cbdca5727..e929dba62 100644
--- a/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
@@ -24,7 +24,6 @@ spec:
annotations:
createdby: 'kubespray'
spec:
- hostNetwork: {{ coredns_host_network | default(false) }}
securityContext:
seccompProfile:
type: RuntimeDefault
@@ -76,10 +75,10 @@ spec:
- name: config-volume
mountPath: /etc/coredns
ports:
- - containerPort: {{ coredns_port }}
+ - containerPort: 53
name: dns
protocol: UDP
- - containerPort: {{ coredns_port }}
+ - containerPort: 53
name: dns-tcp
protocol: TCP
- containerPort: 9153
diff --git a/roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2 b/roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2
index 961e02a6a..0e051c346 100644
--- a/roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2
@@ -20,11 +20,9 @@ spec:
- name: dns
port: 53
protocol: UDP
- targetPort: "dns"
- name: dns-tcp
port: 53
protocol: TCP
- targetPort: "dns-tcp"
- name: metrics
port: 9153
protocol: TCP
--
GitLab