15308555518/ kubekey
1
0
Fork 0
mirror of https://github.com/kubesphere/kubekey.git synced 2025-12-25 17:12:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: coredns configmap is not correct. (#2323) 

Signed-off-by: joyceliu <joyceliu@yunify.com>
Co-authored-by: joyceliu <joyceliu@yunify.com>
This commit is contained in:
II 2024-07-18 10:22:18 +08:00 committed by GitHub
parent 9a98a8fd15
commit 3329000719
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/roles/install/kubernetes/tasks/deploy_cluster_dns.yaml
View File

@ -5,7 +5,9 @@
dest: /etc/kubernetes/coredns.yaml
- name: Apply coredns config
command: "kubectl apply -f /etc/kubernetes/coredns.yaml"
command: |
kubectl delete svc kube-dns -n kube-system
kubectl apply -f /etc/kubernetes/coredns.yaml
- name: Get cluster api
command: |

53
builtin/roles/install/kubernetes/templates/dns/coredns.deployment
View File

@ -47,6 +47,7 @@ metadata:
prometheus.io/scrape: "true"
createdby: 'kubekey'
spec:
clusterIP: {{ kubernetes.networking.dns_service_ip }}
selector:
k8s-app: kube-dns
ports:
@ -184,58 +185,58 @@ metadata:
addonmanager.kubernetes.io/mode: EnsureExists
data:
Corefile: |
{% for ez in kubernetes.coredns.zone_configs %}
{% for ez in kubernetes.coredns.zone_configs %}
{{ ez.zones|join:" " }} {
cache {{ ez.cache }}
{% for c in ez.additional_configs %}
{% for c in ez.additional_configs %}
{{ c }}
{% endfor %}
{% endfor %}
{% for r in ez.rewrite %}
{% for r in ez.rewrite %}
rewrite {{ r.rule }} {
{{ r.field }} {{ r.type }} {{ r.value }}
{{ r.options }}
}
{% endfor %}
{% endfor %}
health {
lameduck 5s
}
{% if (ez.kubernetes.zones|defined) %}
{% if (ez.kubernetes.zones|defined) %}
kubernetes {{ ez.kubernetes.zones|join:" " }} in-addr.arpa ip6.arpa {
pods insecure
fallthrough in-addr.arpa ip6.arpa
ttl 30
}
{% endif %}
{% endif %}
{% for f in ez.forward %}
{% for f in ez.forward %}
forward {{ f.from }} {{ f.to|join:" " }} {
{% if (f.except|length > 0) %}except {{ f.except|join:" " }}{% endif %}
{% if (f.force_tcp) %}force_tcp{% endif %}
{% if (f.prefer_udp) %}prefer_udp{% endif %}
{% if (f.max_fails|defined) %}max_fails {{ f.max_fails }}{% endif %}
{% if (f.expire|defined) %}expire {{ f.expire }}{% endif %}
{% if (f.tls|defined) %}tls {{ f.tls.cert_file }} {{ f.tls.key_file }} {{ f.tls.ca_file }}{% endif %}
{% if (f.tls_servername|defined) %}tls_servername {{ f.tls_servername }}{% endif %}
{% if (f.policy|defined) %}policy {{ f.policy }}{% endif %}
{% if (f.health_check|defined) %}health_check {{ f.health_check }}{% endif %}
{% if (f.max_concurrent|defined) %}max_concurrent {{ f.max_concurrent }}{% endif %}
{% if (f.except|length > 0) %} except {{ f.except|join:" " }}{% endif %}
{% if (f.force_tcp) %} force_tcp{% endif %}
{% if (f.prefer_udp) %} prefer_udp{% endif %}
{% if (f.max_fails|defined) %} max_fails {{ f.max_fails }}{% endif %}
{% if (f.expire|defined) %} expire {{ f.expire }}{% endif %}
{% if (f.tls|defined) %} tls {{ f.tls.cert_file }} {{ f.tls.key_file }} {{ f.tls.ca_file }}{% endif %}
{% if (f.tls_servername|defined) %} tls_servername {{ f.tls_servername }}{% endif %}
{% if (f.policy|defined) %} policy {{ f.policy }}{% endif %}
{% if (f.health_check|defined) %} health_check {{ f.health_check }}{% endif %}
{% if (f.max_concurrent|defined) %} max_concurrent {{ f.max_concurrent }}{% endif %}
}
{% endfor %}
{% endfor %}
{% if (kubernetes.coredns.dns_etc_hosts|length > 0) %}
{% if (kubernetes.coredns.dns_etc_hosts|length > 0) %}
hosts /etc/coredns/hosts {
allthrough
}
{% endif %}
{% endif %}
}
{% endfor %}
{% endfor %}
{% if (kubernetes.coredns.dns_etc_hosts|length > 0) %}
{% if (kubernetes.coredns.dns_etc_hosts|length > 0) %}
hosts: |
{% for h in kubernetes.coredns.dns_etc_hosts %}
{% for h in kubernetes.coredns.dns_etc_hosts %}
{{ h }}
{% endfor %}
{% endif %}
{% endfor %}
{% endif %}