diff --git a/cmd/kubeadm/app/cmd/upgrade/plan_test.go b/cmd/kubeadm/app/cmd/upgrade/plan_test.go index 4ad979e915f..ed9c7f93efb 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.8", + DNSVersion: "1.14.9", 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.8 +Kube DNS 1.14.5 1.14.9 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.8", + DNSVersion: "1.14.9", 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.8 +Kube DNS 1.14.5 1.14.9 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.8", + DNSVersion: "1.14.9", 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.8 +Kube DNS 1.14.5 1.14.9 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.8", + DNSVersion: "1.14.9", 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.8 +Kube DNS 1.14.5 1.14.9 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 9a278dd090c..e128d3e9682 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 ( - kubeDNSv190AndAboveVersion = "1.14.8" - coreDNSVersion = "1.0.6" + kubeDNSVersion = "1.14.9" + 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 kube-dns 1.14.9 // 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 @@ -38,7 +38,7 @@ func GetDNSVersion(kubeVersion *version.Version, dns string) string { // return the CoreDNS version return coreDNSVersion default: - return kubeDNSv190AndAboveVersion + return kubeDNSVersion } } diff --git a/cmd/kubeadm/app/phases/addons/dns/versions_test.go b/cmd/kubeadm/app/phases/addons/dns/versions_test.go index c4ca3e78f89..63845548ddf 100644 --- a/cmd/kubeadm/app/phases/addons/dns/versions_test.go +++ b/cmd/kubeadm/app/phases/addons/dns/versions_test.go @@ -32,12 +32,12 @@ func TestGetKubeDNSVersion(t *testing.T) { { k8sVersion: "v1.9.0", dns: kubeadmconstants.KubeDNS, - expected: kubeDNSv190AndAboveVersion, + expected: kubeDNSVersion, }, { k8sVersion: "v1.10.0", dns: kubeadmconstants.KubeDNS, - expected: kubeDNSv190AndAboveVersion, + expected: kubeDNSVersion, }, { k8sVersion: "v1.9.0", diff --git a/cmd/kubeadm/app/phases/upgrade/compute_test.go b/cmd/kubeadm/app/phases/upgrade/compute_test.go index 583f0375f2e..29c63866b9c 100644 --- a/cmd/kubeadm/app/phases/upgrade/compute_test.go +++ b/cmd/kubeadm/app/phases/upgrade/compute_test.go @@ -107,13 +107,13 @@ func TestGetAvailableUpgrades(t *testing.T) { "v1.9.1": 1, }, KubeadmVersion: "v1.9.2", - DNSVersion: "1.14.8", + DNSVersion: "1.14.9", EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.9.3", KubeadmVersion: "v1.9.3", - DNSVersion: "1.14.8", + DNSVersion: "1.14.9", EtcdVersion: "3.1.12", }, }, @@ -139,13 +139,13 @@ func TestGetAvailableUpgrades(t *testing.T) { "v1.9.1": 1, }, KubeadmVersion: "v1.10.0", - DNSVersion: "1.14.8", + DNSVersion: "1.14.9", EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.0", KubeadmVersion: "v1.10.0", - DNSVersion: "1.14.8", + DNSVersion: "1.14.9", EtcdVersion: "3.1.12", }, }, @@ -171,13 +171,13 @@ func TestGetAvailableUpgrades(t *testing.T) { "v1.9.3": 1, }, KubeadmVersion: "v1.9.5", - DNSVersion: "1.14.8", + DNSVersion: "1.14.9", 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.8", + DNSVersion: "1.14.9", EtcdVersion: "3.1.12", }, }, @@ -189,13 +189,13 @@ func TestGetAvailableUpgrades(t *testing.T) { "v1.9.3": 1, }, KubeadmVersion: "v1.9.5", - DNSVersion: "1.14.8", + DNSVersion: "1.14.9", EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.1", KubeadmVersion: "v1.10.1", - DNSVersion: "1.14.8", + DNSVersion: "1.14.9", EtcdVersion: "3.1.12", }, }, @@ -236,13 +236,13 @@ func TestGetAvailableUpgrades(t *testing.T) { "v1.9.5": 1, }, KubeadmVersion: "v1.9.5", - DNSVersion: "1.14.8", + DNSVersion: "1.14.9", EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.0-alpha.2", KubeadmVersion: "v1.10.0-alpha.2", - DNSVersion: "1.14.8", + DNSVersion: "1.14.9", EtcdVersion: "3.1.12", }, }, @@ -269,13 +269,13 @@ func TestGetAvailableUpgrades(t *testing.T) { "v1.9.5": 1, }, KubeadmVersion: "v1.9.5", - DNSVersion: "1.14.8", + DNSVersion: "1.14.9", EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.0-alpha.2", KubeadmVersion: "v1.10.0-alpha.2", - DNSVersion: "1.14.8", + DNSVersion: "1.14.9", EtcdVersion: "3.1.12", }, }, @@ -303,13 +303,13 @@ func TestGetAvailableUpgrades(t *testing.T) { "v1.9.5": 1, }, KubeadmVersion: "v1.9.5", - DNSVersion: "1.14.8", + DNSVersion: "1.14.9", EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.0-beta.1", KubeadmVersion: "v1.10.0-beta.1", - DNSVersion: "1.14.8", + DNSVersion: "1.14.9", EtcdVersion: "3.1.12", }, }, @@ -337,13 +337,13 @@ func TestGetAvailableUpgrades(t *testing.T) { "v1.9.5": 1, }, KubeadmVersion: "v1.9.5", - DNSVersion: "1.14.8", + DNSVersion: "1.14.9", EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.0-rc.1", KubeadmVersion: "v1.10.0-rc.1", - DNSVersion: "1.14.8", + DNSVersion: "1.14.9", EtcdVersion: "3.1.12", }, }, @@ -371,13 +371,13 @@ func TestGetAvailableUpgrades(t *testing.T) { "v1.9.5": 1, }, KubeadmVersion: "v1.9.5", - DNSVersion: "1.14.8", + DNSVersion: "1.14.9", EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.6-rc.1", KubeadmVersion: "v1.10.6-rc.1", - DNSVersion: "1.14.8", + DNSVersion: "1.14.9", EtcdVersion: "3.1.12", }, }, @@ -405,13 +405,13 @@ func TestGetAvailableUpgrades(t *testing.T) { "v1.9.5": 1, }, KubeadmVersion: "v1.9.5", - DNSVersion: "1.14.8", + DNSVersion: "1.14.9", EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.10.0-rc.1", KubeadmVersion: "v1.10.0-rc.1", - DNSVersion: "1.14.8", + DNSVersion: "1.14.9", EtcdVersion: "3.1.12", }, }, @@ -423,13 +423,13 @@ func TestGetAvailableUpgrades(t *testing.T) { "v1.9.5": 1, }, KubeadmVersion: "v1.9.5", - DNSVersion: "1.14.8", + DNSVersion: "1.14.9", EtcdVersion: "3.1.12", }, After: ClusterState{ KubeVersion: "v1.11.0-alpha.2", KubeadmVersion: "v1.11.0-alpha.2", - DNSVersion: "1.14.8", + DNSVersion: "1.14.9", EtcdVersion: "3.1.12", }, },