Merge pull request #10058 from olemarkus/automated-cherry-pick-of-#99…

…17-origin-release-1.18 Automated cherry pick of #9917: Remove force_tcp flag for nodelocalcache dot zone
kubernetes · Oct 16, 2020 · 8f6f718 · 8f6f718
2 parents 6ed4957 + 8812736
commit 8f6f718
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/upup/models/bindata.go b/upup/models/bindata.go
diff --git a/upup/models/cloudup/resources/addons/nodelocaldns.addons.k8s.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/nodelocaldns.addons.k8s.io/k8s-1.12.yaml.template
@@ -85,9 +85,7 @@ data:
         reload
         loop
         bind {{ KubeDNS.NodeLocalDNS.LocalIP }}{{ if NodeLocalDNSServerIP }} {{ NodeLocalDNSServerIP }}{{ end }}
-        forward . __PILLAR__UPSTREAM__SERVERS__ {
-          force_tcp
-        }
+        forward . __PILLAR__UPSTREAM__SERVERS__
         prometheus :9253
     }
 ---