Skip to content

K
k3s
Unverified Commit 56fcfe3b authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #63001 from chuckha/kube-dns

Automatic merge from submit-queue (batch tested with PRs 63001, 62152, 61950). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Bump kube-dns version for kubeadm upgrade Signed-off-by: 's avatarChuck Ha <ha.chuck@gmail.com> **What this PR does / why we need it**: This PR bumps the version of kube-dns to the correct version for the kubeadm upgrade path. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Related to kubernetes/kubeadm#739 although that is a different ticket, the bug was reported there. **Special notes for your reviewer**: This should also be cherry picked to the 1.9 release since the kube-dns was also cherry picked. related PR https://github.com/kubernetes/kubernetes/pull/62678 **Release note**: ```release-note NONE ``` /cc @kubernetes/sig-cluster-lifecycle-pr-reviews
parents bbfa2992 3cbb2833
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 32 deletions
cmd/kubeadm/app/cmd/upgrade/plan_test.go
View file @ 56fcfe3b
...@@ -132,7 +132,7 @@ _____________________________________________________________________ ...@@ -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 ...@@ -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 @@ _____________________________________________________________________ ...@@ -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 ...@@ -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 @@ _____________________________________________________________________ ...@@ -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 ...@@ -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 @@ _____________________________________________________________________ ...@@ -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 ...@@ -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:
......
cmd/kubeadm/app/phases/addons/dns/versions.go
View file @ 56fcfe3b
...@@ -22,13 +22,13 @@ import ( ...@@ -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
......
cmd/kubeadm/app/phases/upgrade/compute_test.go
View file @ 56fcfe3b
...@@ -108,13 +108,13 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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) { ...@@ -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",
}, },
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment