kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "support CoreDNS use host network and config dns port (#10617)" (#11214) 

This reverts commit bc5b38a771.

Co-authored-by: Max Gautier <mg@max.gautier.name>
pull/11287/head
k8s-infra-cherrypick-robot 2024-05-21 04:28:00 -07:00 committed by GitHub
parent ddc254f9b4
commit b83dc9da63
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes-apps/ansible/defaults/main.yml
View File

@ -16,8 +16,6 @@ coredns_ordinal_suffix: ""
coredns_deployment_nodeselector: "kubernetes.io/os: linux" coredns_deployment_nodeselector: "kubernetes.io/os: linux"
coredns_default_zone_cache_block: | coredns_default_zone_cache_block: |
cache 30 cache 30
coredns_host_network: false
coredns_port: 53
coredns_pod_disruption_budget: false coredns_pod_disruption_budget: false
# value for coredns pdb # value for coredns pdb

2
roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2
View File

@ -34,7 +34,7 @@ data:
} }
{% endfor %} {% endfor %}
{% endif %} {% endif %}
.:{{ coredns_port }} { .:53 {
{% if coredns_additional_configs is defined %} {% if coredns_additional_configs is defined %}
{{ coredns_additional_configs | indent(width=8, first=False) }} {{ coredns_additional_configs | indent(width=8, first=False) }}
{% endif %} {% endif %}

5
roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
View File

@ -24,7 +24,6 @@ spec:
annotations: annotations:
createdby: 'kubespray' createdby: 'kubespray'
spec: spec:
hostNetwork: {{ coredns_host_network | default(false) }}
securityContext: securityContext:
seccompProfile: seccompProfile:
type: RuntimeDefault type: RuntimeDefault
@ -76,10 +75,10 @@ spec:
- name: config-volume - name: config-volume
mountPath: /etc/coredns mountPath: /etc/coredns
ports: ports:
- containerPort: {{ coredns_port }} - containerPort: 53
name: dns name: dns
protocol: UDP protocol: UDP
- containerPort: {{ coredns_port }} - containerPort: 53
name: dns-tcp name: dns-tcp
protocol: TCP protocol: TCP
- containerPort: 9153 - containerPort: 9153

2
roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2
View File

@ -20,11 +20,9 @@ spec:
- name: dns - name: dns
port: 53 port: 53
protocol: UDP protocol: UDP
targetPort: "dns"
- name: dns-tcp - name: dns-tcp
port: 53 port: 53
protocol: TCP protocol: TCP
targetPort: "dns-tcp"
- name: metrics - name: metrics
port: 9153 port: 9153
protocol: TCP protocol: TCP