From 3cbb28330606446ec7d8c44a7ea65a2326eca98a Mon Sep 17 00:00:00 2001 From: Chuck Ha Date: Mon, 23 Apr 2018 11:12:53 +0100 Subject: [PATCH] Bump kube-dns version for kubeadm upgrade Signed-off-by: Chuck Ha --- cmd/kubeadm/app/cmd/upgrade/plan_test.go | 16 +++---- cmd/kubeadm/app/phases/addons/dns/versions.go | 4 +- .../app/phases/upgrade/compute_test.go | 44 +++++++++---------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/cmd/kubeadm/app/cmd/upgrade/plan_test.go b/cmd/kubeadm/app/cmd/upgrade/plan_test.go index c75df0780cf..370066310fb 100644 --- a/cmd/kubeadm/app/cmd/upgrade/plan_test.go +++ b/cmd/kubeadm/app/cmd/upgrade/plan_test.go @@ -132,7 +132,7 @@ _____________________________________________________________________ After: upgrade.ClusterState{ KubeVersion: "v1.9.0", KubeadmVersion: "v1.9.0", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, }, @@ -148,7 +148,7 @@ API Server v1.8.3 v1.9.0 Controller Manager v1.8.3 v1.9.0 Scheduler v1.8.3 v1.9.0 Kube Proxy v1.8.3 v1.9.0 -Kube DNS 1.14.5 1.14.9 +Kube DNS 1.14.5 1.14.10 Etcd 3.0.17 3.1.12 You can now apply the upgrade by executing the following command: @@ -193,7 +193,7 @@ _____________________________________________________________________ After: upgrade.ClusterState{ KubeVersion: "v1.9.0", KubeadmVersion: "v1.9.0", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, }, @@ -229,7 +229,7 @@ API Server v1.8.3 v1.9.0 Controller Manager v1.8.3 v1.9.0 Scheduler v1.8.3 v1.9.0 Kube Proxy v1.8.3 v1.9.0 -Kube DNS 1.14.5 1.14.9 +Kube DNS 1.14.5 1.14.10 Etcd 3.0.17 3.1.12 You can now apply the upgrade by executing the following command: @@ -258,7 +258,7 @@ _____________________________________________________________________ After: upgrade.ClusterState{ KubeVersion: "v1.9.0-beta.1", KubeadmVersion: "v1.9.0-beta.1", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, }, @@ -274,7 +274,7 @@ API Server v1.8.5 v1.9.0-beta.1 Controller Manager v1.8.5 v1.9.0-beta.1 Scheduler v1.8.5 v1.9.0-beta.1 Kube Proxy v1.8.5 v1.9.0-beta.1 -Kube DNS 1.14.5 1.14.9 +Kube DNS 1.14.5 1.14.10 Etcd 3.0.17 3.1.12 You can now apply the upgrade by executing the following command: @@ -303,7 +303,7 @@ _____________________________________________________________________ After: upgrade.ClusterState{ KubeVersion: "v1.9.0-rc.1", KubeadmVersion: "v1.9.0-rc.1", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, }, @@ -319,7 +319,7 @@ API Server v1.8.5 v1.9.0-rc.1 Controller Manager v1.8.5 v1.9.0-rc.1 Scheduler v1.8.5 v1.9.0-rc.1 Kube Proxy v1.8.5 v1.9.0-rc.1 -Kube DNS 1.14.5 1.14.9 +Kube DNS 1.14.5 1.14.10 Etcd 3.0.17 3.1.12 You can now apply the upgrade by executing the following command: diff --git a/cmd/kubeadm/app/phases/addons/dns/versions.go b/cmd/kubeadm/app/phases/addons/dns/versions.go index e128d3e9682..162fb76ddab 100644 --- a/cmd/kubeadm/app/phases/addons/dns/versions.go +++ b/cmd/kubeadm/app/phases/addons/dns/versions.go @@ -22,13 +22,13 @@ import ( ) const ( - kubeDNSVersion = "1.14.9" + kubeDNSVersion = "1.14.10" 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.9 + // v1.9.0+ uses kube-dns 1.14.10 // 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 diff --git a/cmd/kubeadm/app/phases/upgrade/compute_test.go b/cmd/kubeadm/app/phases/upgrade/compute_test.go index a9363629e08..c6d05c47823 100644 --- a/cmd/kubeadm/app/phases/upgrade/compute_test.go +++ b/cmd/kubeadm/app/phases/upgrade/compute_test.go @@ -108,13 +108,13 @@ func TestGetAvailableUpgrades(t *testing.T) { "v1.9.1": 1, }, KubeadmVersion: "v1.9.2", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.9.3", KubeadmVersion: "v1.9.3", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, }, @@ -140,13 +140,13 @@ func TestGetAvailableUpgrades(t *testing.T) { "v1.9.1": 1, }, KubeadmVersion: "v1.10.0", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.0", KubeadmVersion: "v1.10.0", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, }, @@ -172,13 +172,13 @@ func TestGetAvailableUpgrades(t *testing.T) { "v1.9.3": 1, }, KubeadmVersion: "v1.9.5", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.9.5", KubeadmVersion: "v1.9.5", // Note: The kubeadm version mustn't be "downgraded" here - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, }, @@ -190,13 +190,13 @@ func TestGetAvailableUpgrades(t *testing.T) { "v1.9.3": 1, }, KubeadmVersion: "v1.9.5", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.1", KubeadmVersion: "v1.10.1", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, }, @@ -237,13 +237,13 @@ func TestGetAvailableUpgrades(t *testing.T) { "v1.9.5": 1, }, KubeadmVersion: "v1.9.5", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.0-alpha.2", KubeadmVersion: "v1.10.0-alpha.2", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, }, @@ -270,13 +270,13 @@ func TestGetAvailableUpgrades(t *testing.T) { "v1.9.5": 1, }, KubeadmVersion: "v1.9.5", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.0-alpha.2", KubeadmVersion: "v1.10.0-alpha.2", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, }, @@ -304,13 +304,13 @@ func TestGetAvailableUpgrades(t *testing.T) { "v1.9.5": 1, }, KubeadmVersion: "v1.9.5", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.0-beta.1", KubeadmVersion: "v1.10.0-beta.1", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, }, @@ -338,13 +338,13 @@ func TestGetAvailableUpgrades(t *testing.T) { "v1.9.5": 1, }, KubeadmVersion: "v1.9.5", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.0-rc.1", KubeadmVersion: "v1.10.0-rc.1", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, }, @@ -372,13 +372,13 @@ func TestGetAvailableUpgrades(t *testing.T) { "v1.9.5": 1, }, KubeadmVersion: "v1.9.5", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.6-rc.1", KubeadmVersion: "v1.10.6-rc.1", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, }, @@ -406,13 +406,13 @@ func TestGetAvailableUpgrades(t *testing.T) { "v1.9.5": 1, }, KubeadmVersion: "v1.9.5", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.0-rc.1", KubeadmVersion: "v1.10.0-rc.1", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, }, @@ -424,13 +424,13 @@ func TestGetAvailableUpgrades(t *testing.T) { "v1.9.5": 1, }, KubeadmVersion: "v1.9.5", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.11.0-alpha.2", KubeadmVersion: "v1.11.0-alpha.2", - DNSVersion: "1.14.9", + DNSVersion: "1.14.10", EtcdVersion: "3.2.18", }, },