From 993e5413ce55d50e67e3f169671c5cec5458e5c2 Mon Sep 17 00:00:00 2001 From: Sandeep Rajan Date: Thu, 22 Feb 2018 10:40:24 -0500 Subject: [PATCH] update version and manifest --- cmd/kubeadm/app/phases/addons/dns/manifests.go | 2 +- cmd/kubeadm/app/phases/addons/dns/versions.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/kubeadm/app/phases/addons/dns/manifests.go b/cmd/kubeadm/app/phases/addons/dns/manifests.go index 4d696f28c7c..26c8878afa6 100644 --- a/cmd/kubeadm/app/phases/addons/dns/manifests.go +++ b/cmd/kubeadm/app/phases/addons/dns/manifests.go @@ -309,7 +309,7 @@ data: health kubernetes {{ .DNSDomain }} in-addr.arpa ip6.arpa { pods insecure - upstream {{ .UpstreamNameserver }} + upstream fallthrough in-addr.arpa ip6.arpa }{{ .Federation }} prometheus :9153 diff --git a/cmd/kubeadm/app/phases/addons/dns/versions.go b/cmd/kubeadm/app/phases/addons/dns/versions.go index 4ab029cd4f5..9a278dd090c 100644 --- a/cmd/kubeadm/app/phases/addons/dns/versions.go +++ b/cmd/kubeadm/app/phases/addons/dns/versions.go @@ -23,13 +23,13 @@ import ( const ( kubeDNSv190AndAboveVersion = "1.14.8" - coreDNSVersion = "1.0.4" + coreDNSVersion = "1.0.6" ) // GetDNSVersion returns the right kube-dns version for a specific k8s version func GetDNSVersion(kubeVersion *version.Version, dns string) string { // v1.9.0+ uses kube-dns 1.14.8 - // v1.9.0+ uses CoreDNS 1.0.4 if feature gate "CoreDNS" is enabled. + // v1.9.0+ uses CoreDNS 1.0.6 if feature gate "CoreDNS" is enabled. // In the future when the version is bumped at HEAD; add conditional logic to return the right versions // Also, the version might be bumped for different k8s releases on the same branch