github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Bump kube-dns version for kubeadm upgrade

Browse Source 
Signed-off-by: Chuck Ha <ha.chuck@gmail.com>
This commit is contained in:
Chuck Ha 2018-04-23 11:12:53 +01:00
parent 9b7439d77d
commit 3cbb283306
No known key found for this signature in database
GPG Key ID: D2B2A4E41BEF2D78
3 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/kubeadm/app/cmd/upgrade/plan_test.go
View File

@ -132,7 +132,7 @@ _____________________________________________________________________
After: upgrade.ClusterState{ After: upgrade.ClusterState{
KubeVersion: "v1.9.0", KubeVersion: "v1.9.0",
KubeadmVersion: "v1.9.0", KubeadmVersion: "v1.9.0",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@ -148,7 +148,7 @@ API Server v1.8.3 v1.9.0
Controller Manager v1.8.3 v1.9.0 Controller Manager v1.8.3 v1.9.0
Scheduler v1.8.3 v1.9.0 Scheduler v1.8.3 v1.9.0
Kube Proxy 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 Etcd 3.0.17 3.1.12
You can now apply the upgrade by executing the following command: You can now apply the upgrade by executing the following command:
@ -193,7 +193,7 @@ _____________________________________________________________________
After: upgrade.ClusterState{ After: upgrade.ClusterState{
KubeVersion: "v1.9.0", KubeVersion: "v1.9.0",
KubeadmVersion: "v1.9.0", KubeadmVersion: "v1.9.0",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@ -229,7 +229,7 @@ API Server v1.8.3 v1.9.0
Controller Manager v1.8.3 v1.9.0 Controller Manager v1.8.3 v1.9.0
Scheduler v1.8.3 v1.9.0 Scheduler v1.8.3 v1.9.0
Kube Proxy 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 Etcd 3.0.17 3.1.12
You can now apply the upgrade by executing the following command: You can now apply the upgrade by executing the following command:
@ -258,7 +258,7 @@ _____________________________________________________________________
After: upgrade.ClusterState{ After: upgrade.ClusterState{
KubeVersion: "v1.9.0-beta.1", KubeVersion: "v1.9.0-beta.1",
KubeadmVersion: "v1.9.0-beta.1", KubeadmVersion: "v1.9.0-beta.1",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", 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 Controller Manager v1.8.5 v1.9.0-beta.1
Scheduler 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 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 Etcd 3.0.17 3.1.12
You can now apply the upgrade by executing the following command: You can now apply the upgrade by executing the following command:
@ -303,7 +303,7 @@ _____________________________________________________________________
After: upgrade.ClusterState{ After: upgrade.ClusterState{
KubeVersion: "v1.9.0-rc.1", KubeVersion: "v1.9.0-rc.1",
KubeadmVersion: "v1.9.0-rc.1", KubeadmVersion: "v1.9.0-rc.1",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", 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 Controller Manager v1.8.5 v1.9.0-rc.1
Scheduler 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 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 Etcd 3.0.17 3.1.12
You can now apply the upgrade by executing the following command: You can now apply the upgrade by executing the following command:

4
cmd/kubeadm/app/phases/addons/dns/versions.go
View File

@ -22,13 +22,13 @@ import (
) )
const ( const (
kubeDNSVersion = "1.14.9" kubeDNSVersion = "1.14.10"
coreDNSVersion = "1.0.6" coreDNSVersion = "1.0.6"
) )
// GetDNSVersion returns the right kube-dns version for a specific k8s version // GetDNSVersion returns the right kube-dns version for a specific k8s version
func GetDNSVersion(kubeVersion *version.Version, dns string) string { 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. // 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 // In the future when the version is bumped at HEAD; add conditional logic to return the right versions

44
cmd/kubeadm/app/phases/upgrade/compute_test.go
View File

@ -108,13 +108,13 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.9.1": 1, "v1.9.1": 1,
}, },
KubeadmVersion: "v1.9.2", KubeadmVersion: "v1.9.2",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.9.3", KubeVersion: "v1.9.3",
KubeadmVersion: "v1.9.3", KubeadmVersion: "v1.9.3",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@ -140,13 +140,13 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.9.1": 1, "v1.9.1": 1,
}, },
KubeadmVersion: "v1.10.0", KubeadmVersion: "v1.10.0",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.10.0", KubeVersion: "v1.10.0",
KubeadmVersion: "v1.10.0", KubeadmVersion: "v1.10.0",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@ -172,13 +172,13 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.9.3": 1, "v1.9.3": 1,
}, },
KubeadmVersion: "v1.9.5", KubeadmVersion: "v1.9.5",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.9.5", KubeVersion: "v1.9.5",
KubeadmVersion: "v1.9.5", // Note: The kubeadm version mustn't be "downgraded" here 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", EtcdVersion: "3.1.12",
}, },
}, },
@ -190,13 +190,13 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.9.3": 1, "v1.9.3": 1,
}, },
KubeadmVersion: "v1.9.5", KubeadmVersion: "v1.9.5",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.10.1", KubeVersion: "v1.10.1",
KubeadmVersion: "v1.10.1", KubeadmVersion: "v1.10.1",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@ -237,13 +237,13 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.9.5": 1, "v1.9.5": 1,
}, },
KubeadmVersion: "v1.9.5", KubeadmVersion: "v1.9.5",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.10.0-alpha.2", KubeVersion: "v1.10.0-alpha.2",
KubeadmVersion: "v1.10.0-alpha.2", KubeadmVersion: "v1.10.0-alpha.2",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@ -270,13 +270,13 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.9.5": 1, "v1.9.5": 1,
}, },
KubeadmVersion: "v1.9.5", KubeadmVersion: "v1.9.5",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.10.0-alpha.2", KubeVersion: "v1.10.0-alpha.2",
KubeadmVersion: "v1.10.0-alpha.2", KubeadmVersion: "v1.10.0-alpha.2",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@ -304,13 +304,13 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.9.5": 1, "v1.9.5": 1,
}, },
KubeadmVersion: "v1.9.5", KubeadmVersion: "v1.9.5",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.10.0-beta.1", KubeVersion: "v1.10.0-beta.1",
KubeadmVersion: "v1.10.0-beta.1", KubeadmVersion: "v1.10.0-beta.1",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@ -338,13 +338,13 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.9.5": 1, "v1.9.5": 1,
}, },
KubeadmVersion: "v1.9.5", KubeadmVersion: "v1.9.5",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.10.0-rc.1", KubeVersion: "v1.10.0-rc.1",
KubeadmVersion: "v1.10.0-rc.1", KubeadmVersion: "v1.10.0-rc.1",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@ -372,13 +372,13 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.9.5": 1, "v1.9.5": 1,
}, },
KubeadmVersion: "v1.9.5", KubeadmVersion: "v1.9.5",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.10.6-rc.1", KubeVersion: "v1.10.6-rc.1",
KubeadmVersion: "v1.10.6-rc.1", KubeadmVersion: "v1.10.6-rc.1",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@ -406,13 +406,13 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.9.5": 1, "v1.9.5": 1,
}, },
KubeadmVersion: "v1.9.5", KubeadmVersion: "v1.9.5",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.10.0-rc.1", KubeVersion: "v1.10.0-rc.1",
KubeadmVersion: "v1.10.0-rc.1", KubeadmVersion: "v1.10.0-rc.1",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@ -424,13 +424,13 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.9.5": 1, "v1.9.5": 1,
}, },
KubeadmVersion: "v1.9.5", KubeadmVersion: "v1.9.5",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.11.0-alpha.2", KubeVersion: "v1.11.0-alpha.2",
KubeadmVersion: "v1.11.0-alpha.2", KubeadmVersion: "v1.11.0-alpha.2",
DNSVersion: "1.14.9", DNSVersion: "1.14.10",
EtcdVersion: "3.2.18", EtcdVersion: "3.2.18",
}, },
}, },