Browse Source

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

This reverts commit bc5b38a771.
pull/11189/head
Max Gautier 11 months ago
committed by GitHub
parent
commit
d8a4aea9bc
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
4 changed files with 3 additions and 8 deletions
  1. 2
      roles/kubernetes-apps/ansible/defaults/main.yml
  2. 2
      roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2
  3. 5
      roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
  4. 2
      roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2

2
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

2
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 %}

5
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

2
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
Loading…
Cancel
Save