From c65520b421f58d5278fb2489d9fbe36654ba553e Mon Sep 17 00:00:00 2001 From: Daneyon Hansen Date: Thu, 26 Oct 2017 09:13:30 -0700 Subject: [PATCH] Updates kube-dns in kubeadm to 1.14.7 --- cmd/kubeadm/app/phases/addons/dns/versions.go | 4 ++-- cmd/kubeadm/app/phases/addons/dns/versions_test.go | 2 +- cmd/kubeadm/app/phases/upgrade/compute_test.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/kubeadm/app/phases/addons/dns/versions.go b/cmd/kubeadm/app/phases/addons/dns/versions.go index 8dea70a2f4e..9130f4a8def 100644 --- a/cmd/kubeadm/app/phases/addons/dns/versions.go +++ b/cmd/kubeadm/app/phases/addons/dns/versions.go @@ -22,7 +22,7 @@ import ( const ( kubeDNSv180AndAboveVersion = "1.14.5" - kubeDNSv190AndAboveVersion = "1.14.6" + kubeDNSv190AndAboveVersion = "1.14.7" kubeDNSProbeSRV = "SRV" kubeDNSProbeA = "A" @@ -31,7 +31,7 @@ const ( // GetKubeDNSVersion returns the right kube-dns version for a specific k8s version func GetKubeDNSVersion(kubeVersion *version.Version) string { // v1.8.0+ uses 1.14.5 - // v1.9.0+ uses 1.14.6 + // v1.9.0+ uses 1.14.7 // In the future when the kube-dns 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 if kubeVersion.Major() == 1 && kubeVersion.Minor() >= 9 { diff --git a/cmd/kubeadm/app/phases/addons/dns/versions_test.go b/cmd/kubeadm/app/phases/addons/dns/versions_test.go index db40ba1e386..de1d286c398 100644 --- a/cmd/kubeadm/app/phases/addons/dns/versions_test.go +++ b/cmd/kubeadm/app/phases/addons/dns/versions_test.go @@ -52,7 +52,7 @@ func TestGetKubeDNSVersion(t *testing.T) { }, { k8sVersion: "v1.9.0", - expected: "1.14.6", + expected: "1.14.7", }, } for _, rt := range tests { diff --git a/cmd/kubeadm/app/phases/upgrade/compute_test.go b/cmd/kubeadm/app/phases/upgrade/compute_test.go index 666ae19aa38..45f1d781dc7 100644 --- a/cmd/kubeadm/app/phases/upgrade/compute_test.go +++ b/cmd/kubeadm/app/phases/upgrade/compute_test.go @@ -399,7 +399,7 @@ func TestGetAvailableUpgrades(t *testing.T) { After: ClusterState{ KubeVersion: "v1.9.0-alpha.1", KubeadmVersion: "v1.9.0-alpha.1", - DNSVersion: "1.14.6", + DNSVersion: "1.14.7", }, }, },