github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #70796 from detiber/revCoreDNS 

[kubeadm] Update CoreDNS Version
pull/58/head
k8s-ci-robot 2018-11-08 12:13:10 -08:00 committed by GitHub
parent f212b9db23 30048e2e6a
commit 91d6d75303
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/constants/constants.go
View File

@ -309,7 +309,7 @@ const (
KubeDNSVersion = "1.14.13" KubeDNSVersion = "1.14.13"
// CoreDNSVersion is the version of CoreDNS to be deployed if it is used // CoreDNSVersion is the version of CoreDNS to be deployed if it is used
CoreDNSVersion = "1.2.4" CoreDNSVersion = "1.2.6"
// ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct // ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct
ClusterConfigurationKind = "ClusterConfiguration" ClusterConfigurationKind = "ClusterConfiguration"

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

@ -176,7 +176,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.10.3", KubeVersion: "v1.10.3",
KubeadmVersion: "v1.10.3", KubeadmVersion: "v1.10.3",
DNSType: "coredns", DNSType: "coredns",
DNSVersion: "1.2.4", DNSVersion: "1.2.6",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@ -215,7 +215,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.10.3", KubeVersion: "v1.10.3",
KubeadmVersion: "v1.10.3", KubeadmVersion: "v1.10.3",
DNSType: "coredns", DNSType: "coredns",
DNSVersion: "1.2.4", DNSVersion: "1.2.6",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@ -254,7 +254,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.11.0", KubeVersion: "v1.11.0",
KubeadmVersion: "v1.11.0", KubeadmVersion: "v1.11.0",
DNSType: "coredns", DNSType: "coredns",
DNSVersion: "1.2.4", DNSVersion: "1.2.6",
EtcdVersion: "3.2.18", EtcdVersion: "3.2.18",
}, },
}, },
@ -293,7 +293,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.10.5", KubeVersion: "v1.10.5",
KubeadmVersion: "v1.10.5", // Note: The kubeadm version mustn't be "downgraded" here KubeadmVersion: "v1.10.5", // Note: The kubeadm version mustn't be "downgraded" here
DNSType: "coredns", DNSType: "coredns",
DNSVersion: "1.2.4", DNSVersion: "1.2.6",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@ -313,7 +313,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.11.1", KubeVersion: "v1.11.1",
KubeadmVersion: "v1.11.1", KubeadmVersion: "v1.11.1",
DNSType: "coredns", DNSType: "coredns",
DNSVersion: "1.2.4", DNSVersion: "1.2.6",
EtcdVersion: "3.2.18", EtcdVersion: "3.2.18",
}, },
}, },
@ -372,7 +372,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.11.0-alpha.2", KubeVersion: "v1.11.0-alpha.2",
KubeadmVersion: "v1.11.0-alpha.2", KubeadmVersion: "v1.11.0-alpha.2",
DNSType: "coredns", DNSType: "coredns",
DNSVersion: "1.2.4", DNSVersion: "1.2.6",
EtcdVersion: "3.2.18", EtcdVersion: "3.2.18",
}, },
}, },
@ -412,7 +412,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.11.0-alpha.2", KubeVersion: "v1.11.0-alpha.2",
KubeadmVersion: "v1.11.0-alpha.2", KubeadmVersion: "v1.11.0-alpha.2",
DNSType: "coredns", DNSType: "coredns",
DNSVersion: "1.2.4", DNSVersion: "1.2.6",
EtcdVersion: "3.2.18", EtcdVersion: "3.2.18",
}, },
}, },
@ -453,7 +453,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.11.0-beta.1", KubeVersion: "v1.11.0-beta.1",
KubeadmVersion: "v1.11.0-beta.1", KubeadmVersion: "v1.11.0-beta.1",
DNSType: "coredns", DNSType: "coredns",
DNSVersion: "1.2.4", DNSVersion: "1.2.6",
EtcdVersion: "3.2.18", EtcdVersion: "3.2.18",
}, },
}, },
@ -494,7 +494,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.11.0-rc.1", KubeVersion: "v1.11.0-rc.1",
KubeadmVersion: "v1.11.0-rc.1", KubeadmVersion: "v1.11.0-rc.1",
DNSType: "coredns", DNSType: "coredns",
DNSVersion: "1.2.4", DNSVersion: "1.2.6",
EtcdVersion: "3.2.18", EtcdVersion: "3.2.18",
}, },
}, },
@ -535,7 +535,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.11.6-rc.1", KubeVersion: "v1.11.6-rc.1",
KubeadmVersion: "v1.11.6-rc.1", KubeadmVersion: "v1.11.6-rc.1",
DNSType: "coredns", DNSType: "coredns",
DNSVersion: "1.2.4", DNSVersion: "1.2.6",
EtcdVersion: "3.2.18", EtcdVersion: "3.2.18",
}, },
}, },
@ -576,7 +576,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.11.0-rc.1", KubeVersion: "v1.11.0-rc.1",
KubeadmVersion: "v1.11.0-rc.1", KubeadmVersion: "v1.11.0-rc.1",
DNSType: "coredns", DNSType: "coredns",
DNSVersion: "1.2.4", DNSVersion: "1.2.6",
EtcdVersion: "3.2.18", EtcdVersion: "3.2.18",
}, },
}, },
@ -596,7 +596,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.12.0-alpha.2", KubeVersion: "v1.12.0-alpha.2",
KubeadmVersion: "v1.12.0-alpha.2", KubeadmVersion: "v1.12.0-alpha.2",
DNSType: "coredns", DNSType: "coredns",
DNSVersion: "1.2.4", DNSVersion: "1.2.6",
EtcdVersion: "3.2.24", EtcdVersion: "3.2.24",
}, },
}, },
@ -649,7 +649,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.12.1", KubeVersion: "v1.12.1",
KubeadmVersion: "v1.12.1", KubeadmVersion: "v1.12.1",
DNSType: "coredns", DNSType: "coredns",
DNSVersion: "1.2.4", DNSVersion: "1.2.6",
EtcdVersion: "3.2.24", EtcdVersion: "3.2.24",
}, },
}, },
@ -686,7 +686,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.12.0", KubeVersion: "v1.12.0",
KubeadmVersion: "v1.12.0", KubeadmVersion: "v1.12.0",
DNSType: "coredns", DNSType: "coredns",
DNSVersion: "1.2.4", DNSVersion: "1.2.6",
EtcdVersion: "3.2.24", EtcdVersion: "3.2.24",
}, },
}, },