diff --git a/cmd/kubeadm/app/phases/addons/dns/dns_test.go b/cmd/kubeadm/app/phases/addons/dns/dns_test.go index 2233bf182d0..5a9f3c0435b 100644 --- a/cmd/kubeadm/app/phases/addons/dns/dns_test.go +++ b/cmd/kubeadm/app/phases/addons/dns/dns_test.go @@ -94,7 +94,7 @@ func TestCompileManifests(t *testing.T) { expected bool }{ { - manifest: v180AndAboveKubeDNSDeployment, + manifest: KubeDNSDeployment, data: struct{ ImageRepository, Arch, Version, DNSBindAddr, DNSProbeAddr, DNSDomain, MasterTaintKey string }{ ImageRepository: "foo", Arch: "foo", diff --git a/cmd/kubeadm/app/phases/addons/dns/manifests.go b/cmd/kubeadm/app/phases/addons/dns/manifests.go index 3a2449af63a..4184555da68 100644 --- a/cmd/kubeadm/app/phases/addons/dns/manifests.go +++ b/cmd/kubeadm/app/phases/addons/dns/manifests.go @@ -17,8 +17,8 @@ limitations under the License. package dns const ( - // v180AndAboveKubeDNSDeployment is the kube-dns Deployment manifest for the kube-dns manifest for v1.7+ - v180AndAboveKubeDNSDeployment = ` + // KubeDNSDeployment is the kube-dns Deployment manifest for the kube-dns manifest for v1.7+ + KubeDNSDeployment = ` apiVersion: apps/v1 kind: Deployment metadata: diff --git a/cmd/kubeadm/app/phases/addons/dns/versions.go b/cmd/kubeadm/app/phases/addons/dns/versions.go index 162fb76ddab..e72eb325fb3 100644 --- a/cmd/kubeadm/app/phases/addons/dns/versions.go +++ b/cmd/kubeadm/app/phases/addons/dns/versions.go @@ -46,7 +46,7 @@ func GetDNSVersion(kubeVersion *version.Version, dns string) string { func GetKubeDNSManifest(kubeVersion *version.Version) string { // v1.8.0+ has only one known YAML manifest spec, just return that here // In the future when the kube-dns version is bumped at HEAD; add conditional logic to return the right manifest - return v180AndAboveKubeDNSDeployment + return KubeDNSDeployment } // GetCoreDNSManifest returns the right CoreDNS YAML manifest for a specific k8s version