mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 11:21:47 +00:00
Merge pull request #70796 from detiber/revCoreDNS
[kubeadm] Update CoreDNS Version
This commit is contained in:
commit
91d6d75303
@ -309,7 +309,7 @@ const (
|
||||
KubeDNSVersion = "1.14.13"
|
||||
|
||||
// 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 = "ClusterConfiguration"
|
||||
|
@ -176,7 +176,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: "v1.10.3",
|
||||
KubeadmVersion: "v1.10.3",
|
||||
DNSType: "coredns",
|
||||
DNSVersion: "1.2.4",
|
||||
DNSVersion: "1.2.6",
|
||||
EtcdVersion: "3.1.12",
|
||||
},
|
||||
},
|
||||
@ -215,7 +215,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: "v1.10.3",
|
||||
KubeadmVersion: "v1.10.3",
|
||||
DNSType: "coredns",
|
||||
DNSVersion: "1.2.4",
|
||||
DNSVersion: "1.2.6",
|
||||
EtcdVersion: "3.1.12",
|
||||
},
|
||||
},
|
||||
@ -254,7 +254,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: "v1.11.0",
|
||||
KubeadmVersion: "v1.11.0",
|
||||
DNSType: "coredns",
|
||||
DNSVersion: "1.2.4",
|
||||
DNSVersion: "1.2.6",
|
||||
EtcdVersion: "3.2.18",
|
||||
},
|
||||
},
|
||||
@ -293,7 +293,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: "v1.10.5",
|
||||
KubeadmVersion: "v1.10.5", // Note: The kubeadm version mustn't be "downgraded" here
|
||||
DNSType: "coredns",
|
||||
DNSVersion: "1.2.4",
|
||||
DNSVersion: "1.2.6",
|
||||
EtcdVersion: "3.1.12",
|
||||
},
|
||||
},
|
||||
@ -313,7 +313,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: "v1.11.1",
|
||||
KubeadmVersion: "v1.11.1",
|
||||
DNSType: "coredns",
|
||||
DNSVersion: "1.2.4",
|
||||
DNSVersion: "1.2.6",
|
||||
EtcdVersion: "3.2.18",
|
||||
},
|
||||
},
|
||||
@ -372,7 +372,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: "v1.11.0-alpha.2",
|
||||
KubeadmVersion: "v1.11.0-alpha.2",
|
||||
DNSType: "coredns",
|
||||
DNSVersion: "1.2.4",
|
||||
DNSVersion: "1.2.6",
|
||||
EtcdVersion: "3.2.18",
|
||||
},
|
||||
},
|
||||
@ -412,7 +412,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: "v1.11.0-alpha.2",
|
||||
KubeadmVersion: "v1.11.0-alpha.2",
|
||||
DNSType: "coredns",
|
||||
DNSVersion: "1.2.4",
|
||||
DNSVersion: "1.2.6",
|
||||
EtcdVersion: "3.2.18",
|
||||
},
|
||||
},
|
||||
@ -453,7 +453,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: "v1.11.0-beta.1",
|
||||
KubeadmVersion: "v1.11.0-beta.1",
|
||||
DNSType: "coredns",
|
||||
DNSVersion: "1.2.4",
|
||||
DNSVersion: "1.2.6",
|
||||
EtcdVersion: "3.2.18",
|
||||
},
|
||||
},
|
||||
@ -494,7 +494,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: "v1.11.0-rc.1",
|
||||
KubeadmVersion: "v1.11.0-rc.1",
|
||||
DNSType: "coredns",
|
||||
DNSVersion: "1.2.4",
|
||||
DNSVersion: "1.2.6",
|
||||
EtcdVersion: "3.2.18",
|
||||
},
|
||||
},
|
||||
@ -535,7 +535,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: "v1.11.6-rc.1",
|
||||
KubeadmVersion: "v1.11.6-rc.1",
|
||||
DNSType: "coredns",
|
||||
DNSVersion: "1.2.4",
|
||||
DNSVersion: "1.2.6",
|
||||
EtcdVersion: "3.2.18",
|
||||
},
|
||||
},
|
||||
@ -576,7 +576,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: "v1.11.0-rc.1",
|
||||
KubeadmVersion: "v1.11.0-rc.1",
|
||||
DNSType: "coredns",
|
||||
DNSVersion: "1.2.4",
|
||||
DNSVersion: "1.2.6",
|
||||
EtcdVersion: "3.2.18",
|
||||
},
|
||||
},
|
||||
@ -596,7 +596,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: "v1.12.0-alpha.2",
|
||||
KubeadmVersion: "v1.12.0-alpha.2",
|
||||
DNSType: "coredns",
|
||||
DNSVersion: "1.2.4",
|
||||
DNSVersion: "1.2.6",
|
||||
EtcdVersion: "3.2.24",
|
||||
},
|
||||
},
|
||||
@ -649,7 +649,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: "v1.12.1",
|
||||
KubeadmVersion: "v1.12.1",
|
||||
DNSType: "coredns",
|
||||
DNSVersion: "1.2.4",
|
||||
DNSVersion: "1.2.6",
|
||||
EtcdVersion: "3.2.24",
|
||||
},
|
||||
},
|
||||
@ -686,7 +686,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: "v1.12.0",
|
||||
KubeadmVersion: "v1.12.0",
|
||||
DNSType: "coredns",
|
||||
DNSVersion: "1.2.4",
|
||||
DNSVersion: "1.2.6",
|
||||
EtcdVersion: "3.2.24",
|
||||
},
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user