github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #61918 from MrHohn/kube-dns-1.14.9-kubeadm

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 61918, 62180, 62198). 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>.

[kubeadm] Bump kube-dns to 1.14.9

**What this PR does / why we need it**:
Bump kube-dns to 1.14.9 for kubeadm. Ref #61908.

cc @rramkumar1

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #NONE 

**Special notes for your reviewer**:

**Release note**:

```release-note
Update kube-dns to Version 1.14.9 in kubeadm.
```
This commit is contained in:
Kubernetes Submit Queue
2018-04-06 11:56:04 -07:00
committed by GitHub
parent 4009cb3b8b ce2d2c7dab
commit 3bba2d6d3f
4 changed files with 36 additions and 36 deletions
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.8", DNSVersion: "1.14.9",
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.8 Kube DNS 1.14.5 1.14.9
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.8", DNSVersion: "1.14.9",
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.8 Kube DNS 1.14.5 1.14.9
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.8", DNSVersion: "1.14.9",
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.8 Kube DNS 1.14.5 1.14.9
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.8", DNSVersion: "1.14.9",
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.8 Kube DNS 1.14.5 1.14.9
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:

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

@@ -22,13 +22,13 @@ import (
) )
const ( const (
kubeDNSv190AndAboveVersion = "1.14.8" kubeDNSVersion = "1.14.9"
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.8 // v1.9.0+ uses kube-dns 1.14.9
// 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
@@ -38,7 +38,7 @@ func GetDNSVersion(kubeVersion *version.Version, dns string) string {
// return the CoreDNS version // return the CoreDNS version
return coreDNSVersion return coreDNSVersion
default: default:
return kubeDNSv190AndAboveVersion return kubeDNSVersion
} }
} }

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

@@ -32,12 +32,12 @@ func TestGetKubeDNSVersion(t *testing.T) {
{ {
k8sVersion: "v1.9.0", k8sVersion: "v1.9.0",
dns: kubeadmconstants.KubeDNS, dns: kubeadmconstants.KubeDNS,
expected: kubeDNSv190AndAboveVersion, expected: kubeDNSVersion,
}, },
{ {
k8sVersion: "v1.10.0", k8sVersion: "v1.10.0",
dns: kubeadmconstants.KubeDNS, dns: kubeadmconstants.KubeDNS,
expected: kubeDNSv190AndAboveVersion, expected: kubeDNSVersion,
}, },
{ {
k8sVersion: "v1.9.0", k8sVersion: "v1.9.0",

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

@@ -107,13 +107,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.8", DNSVersion: "1.14.9",
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.8", DNSVersion: "1.14.9",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@@ -139,13 +139,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.8", DNSVersion: "1.14.9",
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.8", DNSVersion: "1.14.9",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@@ -171,13 +171,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.8", DNSVersion: "1.14.9",
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.8", DNSVersion: "1.14.9",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@@ -189,13 +189,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.8", DNSVersion: "1.14.9",
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.8", DNSVersion: "1.14.9",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@@ -236,13 +236,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.8", DNSVersion: "1.14.9",
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.8", DNSVersion: "1.14.9",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@@ -269,13 +269,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.8", DNSVersion: "1.14.9",
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.8", DNSVersion: "1.14.9",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@@ -303,13 +303,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.8", DNSVersion: "1.14.9",
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.8", DNSVersion: "1.14.9",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@@ -337,13 +337,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.8", DNSVersion: "1.14.9",
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.8", DNSVersion: "1.14.9",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@@ -371,13 +371,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.8", DNSVersion: "1.14.9",
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.8", DNSVersion: "1.14.9",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@@ -405,13 +405,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.8", DNSVersion: "1.14.9",
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.8", DNSVersion: "1.14.9",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@@ -423,13 +423,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.8", DNSVersion: "1.14.9",
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.8", DNSVersion: "1.14.9",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },