github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update kubeadm to 1.14.5

Browse Source
This commit is contained in:
Bowei Du
2017-09-26 15:33:06 -07:00
parent dfc8f7ad98
commit c122a7c54f
4 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,12 +80,12 @@ func TestPrintAvailableUpgrades(t *testing.T) {
"v1.7.1": 1, "v1.7.1": 1,
}, },
KubeadmVersion: "v1.7.2", KubeadmVersion: "v1.7.2",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: upgrade.ClusterState{ After: upgrade.ClusterState{
KubeVersion: "v1.7.3", KubeVersion: "v1.7.3",
KubeadmVersion: "v1.7.3", KubeadmVersion: "v1.7.3",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
@@ -100,7 +100,7 @@ API Server v1.7.1 v1.7.3
Controller Manager v1.7.1 v1.7.3 Controller Manager v1.7.1 v1.7.3
Scheduler v1.7.1 v1.7.3 Scheduler v1.7.1 v1.7.3
Kube Proxy v1.7.1 v1.7.3 Kube Proxy v1.7.1 v1.7.3
Kube DNS 1.14.4 1.14.4 Kube DNS 1.14.5 1.14.5
You can now apply the upgrade by executing the following command: You can now apply the upgrade by executing the following command:
@@ -122,12 +122,12 @@ _____________________________________________________________________
"v1.7.3": 1, "v1.7.3": 1,
}, },
KubeadmVersion: "v1.8.0", KubeadmVersion: "v1.8.0",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: upgrade.ClusterState{ After: upgrade.ClusterState{
KubeVersion: "v1.8.0", KubeVersion: "v1.8.0",
KubeadmVersion: "v1.8.0", KubeadmVersion: "v1.8.0",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
@@ -142,7 +142,7 @@ API Server v1.7.3 v1.8.0
Controller Manager v1.7.3 v1.8.0 Controller Manager v1.7.3 v1.8.0
Scheduler v1.7.3 v1.8.0 Scheduler v1.7.3 v1.8.0
Kube Proxy v1.7.3 v1.8.0 Kube Proxy v1.7.3 v1.8.0
Kube DNS 1.14.4 1.14.4 Kube DNS 1.14.5 1.14.5
You can now apply the upgrade by executing the following command: You can now apply the upgrade by executing the following command:
@@ -162,12 +162,12 @@ _____________________________________________________________________
"v1.7.3": 1, "v1.7.3": 1,
}, },
KubeadmVersion: "v1.8.1", KubeadmVersion: "v1.8.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: upgrade.ClusterState{ After: upgrade.ClusterState{
KubeVersion: "v1.7.5", KubeVersion: "v1.7.5",
KubeadmVersion: "v1.8.1", KubeadmVersion: "v1.8.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
{ {
@@ -178,12 +178,12 @@ _____________________________________________________________________
"v1.7.3": 1, "v1.7.3": 1,
}, },
KubeadmVersion: "v1.8.1", KubeadmVersion: "v1.8.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: upgrade.ClusterState{ After: upgrade.ClusterState{
KubeVersion: "v1.8.2", KubeVersion: "v1.8.2",
KubeadmVersion: "v1.8.2", KubeadmVersion: "v1.8.2",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
@@ -198,7 +198,7 @@ API Server v1.7.3 v1.7.5
Controller Manager v1.7.3 v1.7.5 Controller Manager v1.7.3 v1.7.5
Scheduler v1.7.3 v1.7.5 Scheduler v1.7.3 v1.7.5
Kube Proxy v1.7.3 v1.7.5 Kube Proxy v1.7.3 v1.7.5
Kube DNS 1.14.4 1.14.4 Kube DNS 1.14.5 1.14.5
You can now apply the upgrade by executing the following command: You can now apply the upgrade by executing the following command:
@@ -217,7 +217,7 @@ API Server v1.7.3 v1.8.2
Controller Manager v1.7.3 v1.8.2 Controller Manager v1.7.3 v1.8.2
Scheduler v1.7.3 v1.8.2 Scheduler v1.7.3 v1.8.2
Kube Proxy v1.7.3 v1.8.2 Kube Proxy v1.7.3 v1.8.2
Kube DNS 1.14.4 1.14.4 Kube DNS 1.14.5 1.14.5
You can now apply the upgrade by executing the following command: You can now apply the upgrade by executing the following command:
@@ -239,12 +239,12 @@ _____________________________________________________________________
"v1.7.5": 1, "v1.7.5": 1,
}, },
KubeadmVersion: "v1.7.5", KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: upgrade.ClusterState{ After: upgrade.ClusterState{
KubeVersion: "v1.8.0-beta.1", KubeVersion: "v1.8.0-beta.1",
KubeadmVersion: "v1.8.0-beta.1", KubeadmVersion: "v1.8.0-beta.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
@@ -259,7 +259,7 @@ API Server v1.7.5 v1.8.0-beta.1
Controller Manager v1.7.5 v1.8.0-beta.1 Controller Manager v1.7.5 v1.8.0-beta.1
Scheduler v1.7.5 v1.8.0-beta.1 Scheduler v1.7.5 v1.8.0-beta.1
Kube Proxy v1.7.5 v1.8.0-beta.1 Kube Proxy v1.7.5 v1.8.0-beta.1
Kube DNS 1.14.4 1.14.4 Kube DNS 1.14.5 1.14.5
You can now apply the upgrade by executing the following command: You can now apply the upgrade by executing the following command:
@@ -281,12 +281,12 @@ _____________________________________________________________________
"v1.7.5": 1, "v1.7.5": 1,
}, },
KubeadmVersion: "v1.7.5", KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: upgrade.ClusterState{ After: upgrade.ClusterState{
KubeVersion: "v1.8.0-rc.1", KubeVersion: "v1.8.0-rc.1",
KubeadmVersion: "v1.8.0-rc.1", KubeadmVersion: "v1.8.0-rc.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
@@ -301,7 +301,7 @@ API Server v1.7.5 v1.8.0-rc.1
Controller Manager v1.7.5 v1.8.0-rc.1 Controller Manager v1.7.5 v1.8.0-rc.1
Scheduler v1.7.5 v1.8.0-rc.1 Scheduler v1.7.5 v1.8.0-rc.1
Kube Proxy v1.7.5 v1.8.0-rc.1 Kube Proxy v1.7.5 v1.8.0-rc.1
Kube DNS 1.14.4 1.14.4 Kube DNS 1.14.5 1.14.5
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

@@ -21,12 +21,12 @@ import (
) )
const ( const (
kubeDNSv170AndAboveVersion = "1.14.4" kubeDNSv170AndAboveVersion = "1.14.5"
) )
// GetKubeDNSVersion returns the right kube-dns version for a specific k8s version // GetKubeDNSVersion returns the right kube-dns version for a specific k8s version
func GetKubeDNSVersion(kubeVersion *version.Version) string { func GetKubeDNSVersion(kubeVersion *version.Version) string {
// v1.7.0+ uses 1.14.4, just return that here // v1.7.0+ uses 1.14.5, just return that here
// In the future when the kube-dns version is bumped at HEAD; add conditional logic to return the right versions // In the future when the kube-dns version is bumped at HEAD; add conditional logic to return the right versions
// Also, the version might be bumped for different k8s releases on the same branch // Also, the version might be bumped for different k8s releases on the same branch
return kubeDNSv170AndAboveVersion return kubeDNSv170AndAboveVersion

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

@@ -28,27 +28,27 @@ func TestGetKubeDNSVersion(t *testing.T) {
}{ }{
{ {
k8sVersion: "v1.7.0", k8sVersion: "v1.7.0",
expected: "1.14.4", expected: "1.14.5",
}, },
{ {
k8sVersion: "v1.7.1", k8sVersion: "v1.7.1",
expected: "1.14.4", expected: "1.14.5",
}, },
{ {
k8sVersion: "v1.7.2", k8sVersion: "v1.7.2",
expected: "1.14.4", expected: "1.14.5",
}, },
{ {
k8sVersion: "v1.7.3", k8sVersion: "v1.7.3",
expected: "1.14.4", expected: "1.14.5",
}, },
{ {
k8sVersion: "v1.8.0-alpha.2", k8sVersion: "v1.8.0-alpha.2",
expected: "1.14.4", expected: "1.14.5",
}, },
{ {
k8sVersion: "v1.8.0", k8sVersion: "v1.8.0",
expected: "1.14.4", expected: "1.14.5",
}, },
} }
for _, rt := range tests { for _, rt := range tests {

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

@@ -98,12 +98,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.1": 1, "v1.7.1": 1,
}, },
KubeadmVersion: "v1.7.2", KubeadmVersion: "v1.7.2",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.7.3", KubeVersion: "v1.7.3",
KubeadmVersion: "v1.7.3", KubeadmVersion: "v1.7.3",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
@@ -128,12 +128,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.3": 1, "v1.7.3": 1,
}, },
KubeadmVersion: "v1.8.0", KubeadmVersion: "v1.8.0",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.8.0", KubeVersion: "v1.8.0",
KubeadmVersion: "v1.8.0", KubeadmVersion: "v1.8.0",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
@@ -158,12 +158,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.3": 1, "v1.7.3": 1,
}, },
KubeadmVersion: "v1.8.1", KubeadmVersion: "v1.8.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.7.5", KubeVersion: "v1.7.5",
KubeadmVersion: "v1.8.1", // Note: The kubeadm version mustn't be "downgraded" here KubeadmVersion: "v1.8.1", // Note: The kubeadm version mustn't be "downgraded" here
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
{ {
@@ -174,12 +174,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.3": 1, "v1.7.3": 1,
}, },
KubeadmVersion: "v1.8.1", KubeadmVersion: "v1.8.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.8.2", KubeVersion: "v1.8.2",
KubeadmVersion: "v1.8.2", KubeadmVersion: "v1.8.2",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
@@ -219,12 +219,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.5": 1, "v1.7.5": 1,
}, },
KubeadmVersion: "v1.7.5", KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.8.0-alpha.2", KubeVersion: "v1.8.0-alpha.2",
KubeadmVersion: "v1.8.0-alpha.2", KubeadmVersion: "v1.8.0-alpha.2",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
@@ -250,12 +250,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.5": 1, "v1.7.5": 1,
}, },
KubeadmVersion: "v1.7.5", KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.8.0-alpha.2", KubeVersion: "v1.8.0-alpha.2",
KubeadmVersion: "v1.8.0-alpha.2", KubeadmVersion: "v1.8.0-alpha.2",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
@@ -282,12 +282,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.5": 1, "v1.7.5": 1,
}, },
KubeadmVersion: "v1.7.5", KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.8.0-beta.1", KubeVersion: "v1.8.0-beta.1",
KubeadmVersion: "v1.8.0-beta.1", KubeadmVersion: "v1.8.0-beta.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
@@ -314,12 +314,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.5": 1, "v1.7.5": 1,
}, },
KubeadmVersion: "v1.7.5", KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.8.0-rc.1", KubeVersion: "v1.8.0-rc.1",
KubeadmVersion: "v1.8.0-rc.1", KubeadmVersion: "v1.8.0-rc.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
@@ -346,12 +346,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.5": 1, "v1.7.5": 1,
}, },
KubeadmVersion: "v1.7.5", KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.8.0-rc.1", KubeVersion: "v1.8.0-rc.1",
KubeadmVersion: "v1.8.0-rc.1", KubeadmVersion: "v1.8.0-rc.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
@@ -378,12 +378,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.5": 1, "v1.7.5": 1,
}, },
KubeadmVersion: "v1.7.5", KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.8.0-rc.1", KubeVersion: "v1.8.0-rc.1",
KubeadmVersion: "v1.8.0-rc.1", KubeadmVersion: "v1.8.0-rc.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
{ {
@@ -394,12 +394,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.5": 1, "v1.7.5": 1,
}, },
KubeadmVersion: "v1.7.5", KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.9.0-alpha.1", KubeVersion: "v1.9.0-alpha.1",
KubeadmVersion: "v1.9.0-alpha.1", KubeadmVersion: "v1.9.0-alpha.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },