Merge pull request #67302 from dixudx/dnsmasq_add_loop_detect

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. add --dns-loop-detect option to dnsmasq run by kube-dns **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #67299 **Special notes for your reviewer**: /cc @kubernetes/sig-network-pr-reviews **Release note**: ```release-note add --dns-loop-detect option to dnsmasq run by kube-dns ```

Merge pull request #67302 from dixudx/dnsmasq_add_loop_detect
31420467 · Kubernetes Submit Queue · GitHub · b44a7680 · 25f9909c · 31420467
Unverified Commit 31420467 authored Aug 18, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 18, 2018
5 changed files
--- a/cluster/addons/dns/kube-dns/kube-dns.yaml.base
+++ b/cluster/addons/dns/kube-dns/kube-dns.yaml.base
@@ -166,6 +166,7 @@ spec:
        - -k
        - --cache-size=1000
        - --no-negcache
+        - --dns-loop-detect
        - --log-facility=-
        - --server=/__PILLAR__DNS__DOMAIN__/127.0.0.1#10053
        - --server=/in-addr.arpa/127.0.0.1#10053

--- a/cluster/addons/dns/kube-dns/kube-dns.yaml.in
+++ b/cluster/addons/dns/kube-dns/kube-dns.yaml.in
@@ -166,6 +166,7 @@ spec:
        - -k
        - --cache-size=1000
        - --no-negcache
+        - --dns-loop-detect
        - --log-facility=-
        - --server=/{{ pillar['dns_domain'] }}/127.0.0.1#10053
        - --server=/in-addr.arpa/127.0.0.1#10053

--- a/cluster/addons/dns/kube-dns/kube-dns.yaml.sed
+++ b/cluster/addons/dns/kube-dns/kube-dns.yaml.sed
@@ -166,6 +166,7 @@ spec:
        - -k
        - --cache-size=1000
        - --no-negcache
+        - --dns-loop-detect
        - --log-facility=-
        - --server=/$DNS_DOMAIN/127.0.0.1#10053
        - --server=/in-addr.arpa/127.0.0.1#10053

--- a/cmd/kubeadm/app/phases/addons/dns/manifests.go
+++ b/cmd/kubeadm/app/phases/addons/dns/manifests.go
@@ -122,6 +122,7 @@ spec:
        - -k
        - --cache-size=1000
        - --no-negcache
+        - --dns-loop-detect
        - --log-facility=-
        - --server=/{{ .DNSDomain }}/{{ .DNSBindAddr }}#10053
        - --server=/in-addr.arpa/{{ .DNSBindAddr }}#10053

--- a/test/kubemark/resources/kube_dns_template.yaml
+++ b/test/kubemark/resources/kube_dns_template.yaml
@@ -140,6 +140,7 @@ spec:
        - -k
        - --cache-size=1000
        - --no-negcache
+        - --dns-loop-detect
        - --log-facility=-
        - --server=/{{dns_domain}}/127.0.0.1#10053
        - --server=/in-addr.arpa/127.0.0.1#10053