Browse Source
Merge pull request #11722 from k8s-infra-cherrypick-robot/cherry-pick-11694-to-release-2.24
[release-2.24] Fix pretty-printing of coredns and nodelocaldns configmaps
release-2.24
Kay Yan
5 days ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
9 additions and
3 deletions
-
roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2
-
roles/kubernetes-apps/ansible/templates/nodelocaldns-config.yml.j2
|
|
|
@ -70,7 +70,9 @@ data: |
|
|
|
max_concurrent 1000 |
|
|
|
{% if dns_upstream_forward_extra_opts is defined %} |
|
|
|
{% for optname, optvalue in dns_upstream_forward_extra_opts.items() %} |
|
|
|
{{ optname }} {{ optvalue }} |
|
|
|
{{ (optname ~ ' ' ~ optvalue) | trim }} |
|
|
|
{# do not add a trailing space when optvalue == '' |
|
|
|
workaround for: https://github.com/kubernetes/kubernetes/issues/36222 #} |
|
|
|
{% endfor %} |
|
|
|
{% endif %} |
|
|
|
} |
|
|
|
|
|
|
|
@ -82,7 +82,9 @@ data: |
|
|
|
bind {{ nodelocaldns_ip }} |
|
|
|
forward . {{ upstreamForwardTarget }}{% if dns_upstream_forward_extra_opts is defined %} { |
|
|
|
{% for optname, optvalue in dns_upstream_forward_extra_opts.items() %} |
|
|
|
{{ optname }} {{ optvalue }} |
|
|
|
{{ (optname ~ ' ' ~ optvalue) | trim }} |
|
|
|
{# do not add a trailing space when optvalue == '' |
|
|
|
workaround for: https://github.com/kubernetes/kubernetes/issues/36222 #} |
|
|
|
{% endfor %} |
|
|
|
}{% endif %} |
|
|
|
|
|
|
|
@ -164,7 +166,9 @@ data: |
|
|
|
bind {{ nodelocaldns_ip }} |
|
|
|
forward . {{ upstreamForwardTarget }}{% if dns_upstream_forward_extra_opts is defined %} { |
|
|
|
{% for optname, optvalue in dns_upstream_forward_extra_opts.items() %} |
|
|
|
{{ optname }} {{ optvalue }} |
|
|
|
{{ (optname ~ ' ' ~ optvalue) | trim }} |
|
|
|
{# do not add a trailing space when optvalue == '' |
|
|
|
workaround for: https://github.com/kubernetes/kubernetes/issues/36222 #} |
|
|
|
{% endfor %} |
|
|
|
}{% endif %} |
|
|
|
|
|
|
|
|
