Merge pull request #56170 from rajansandeep/corefileupdate

Automatic merge from submit-queue (batch tested with PRs 55340, 55329, 56168, 56170, 56105). 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>. Update the configmap manifest in CoreDNS **What this PR does / why we need it**: This PR updates the corefile to retain the pod requests support like in kube-dns. This helps when upgrading CoreDNS using kubeadm upgrade (#55952). **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 # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #56170 from rajansandeep/corefileupdate
943d3724 · Kubernetes Submit Queue · GitHub · d5bc9a41 · 475d30c8 · 943d3724
Unverified Commit 943d3724 authored Nov 21, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

manifests.go cmd/kubeadm/app/phases/addons/dns/manifests.go +3 -1

No files found.
--- a/cmd/kubeadm/app/phases/addons/dns/manifests.go
+++ b/cmd/kubeadm/app/phases/addons/dns/manifests.go
@@ -295,7 +295,9 @@ data:
        errors
        log stdout
        health
-        kubernetes {{ .DNSDomain }} {{ .ServiceCIDR }}
+        kubernetes {{ .DNSDomain }} {{ .ServiceCIDR }} {
+           pods insecure
+        }
        prometheus
        proxy . /etc/resolv.conf
        cache 30