mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 04:06:03 +00:00
Merge pull request #79728 from yastij/consolidate-coredns-versions
consolidate coreDNS version to ease dependency bump
This commit is contained in:
commit
f87cc40b7f
@ -186,7 +186,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(),
|
||||
KubeadmVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(),
|
||||
DNSType: kubeadmapi.CoreDNS,
|
||||
DNSVersion: "1.3.1",
|
||||
DNSVersion: constants.CoreDNSVersion,
|
||||
EtcdVersion: getEtcdVersion(constants.MinimumControlPlaneVersion),
|
||||
},
|
||||
},
|
||||
@ -225,7 +225,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(),
|
||||
KubeadmVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(),
|
||||
DNSType: kubeadmapi.CoreDNS,
|
||||
DNSVersion: "1.3.1",
|
||||
DNSVersion: constants.CoreDNSVersion,
|
||||
EtcdVersion: getEtcdVersion(constants.MinimumControlPlaneVersion),
|
||||
},
|
||||
},
|
||||
@ -264,7 +264,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: constants.CurrentKubernetesVersion.String(),
|
||||
KubeadmVersion: constants.CurrentKubernetesVersion.String(),
|
||||
DNSType: kubeadmapi.CoreDNS,
|
||||
DNSVersion: "1.3.1",
|
||||
DNSVersion: constants.CoreDNSVersion,
|
||||
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
|
||||
},
|
||||
},
|
||||
@ -303,7 +303,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: constants.MinimumControlPlaneVersion.WithPatch(5).String(),
|
||||
KubeadmVersion: constants.MinimumControlPlaneVersion.WithPatch(5).String(), // Note: The kubeadm version mustn't be "downgraded" here
|
||||
DNSType: kubeadmapi.CoreDNS,
|
||||
DNSVersion: "1.3.1",
|
||||
DNSVersion: constants.CoreDNSVersion,
|
||||
EtcdVersion: getEtcdVersion(constants.MinimumControlPlaneVersion),
|
||||
},
|
||||
},
|
||||
@ -323,7 +323,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: constants.CurrentKubernetesVersion.WithPatch(1).String(),
|
||||
KubeadmVersion: constants.CurrentKubernetesVersion.WithPatch(1).String(),
|
||||
DNSType: kubeadmapi.CoreDNS,
|
||||
DNSVersion: "1.3.1",
|
||||
DNSVersion: constants.CoreDNSVersion,
|
||||
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
|
||||
},
|
||||
},
|
||||
@ -382,7 +382,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(),
|
||||
KubeadmVersion: constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(),
|
||||
DNSType: kubeadmapi.CoreDNS,
|
||||
DNSVersion: "1.3.1",
|
||||
DNSVersion: constants.CoreDNSVersion,
|
||||
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
|
||||
},
|
||||
},
|
||||
@ -422,7 +422,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(),
|
||||
KubeadmVersion: constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(),
|
||||
DNSType: kubeadmapi.CoreDNS,
|
||||
DNSVersion: "1.3.1",
|
||||
DNSVersion: constants.CoreDNSVersion,
|
||||
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
|
||||
},
|
||||
},
|
||||
@ -463,7 +463,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: "v1.13.0-beta.1",
|
||||
KubeadmVersion: "v1.13.0-beta.1",
|
||||
DNSType: kubeadmapi.CoreDNS,
|
||||
DNSVersion: "1.3.1",
|
||||
DNSVersion: constants.CoreDNSVersion,
|
||||
EtcdVersion: "3.2.24",
|
||||
},
|
||||
},
|
||||
@ -504,7 +504,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: "v1.13.0-rc.1",
|
||||
KubeadmVersion: "v1.13.0-rc.1",
|
||||
DNSType: kubeadmapi.CoreDNS,
|
||||
DNSVersion: "1.3.1",
|
||||
DNSVersion: constants.CoreDNSVersion,
|
||||
EtcdVersion: "3.2.24",
|
||||
},
|
||||
},
|
||||
@ -545,7 +545,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: "v1.13.6-rc.1",
|
||||
KubeadmVersion: "v1.13.6-rc.1",
|
||||
DNSType: kubeadmapi.CoreDNS,
|
||||
DNSVersion: "1.3.1",
|
||||
DNSVersion: constants.CoreDNSVersion,
|
||||
EtcdVersion: "3.2.24",
|
||||
},
|
||||
},
|
||||
@ -586,7 +586,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: "v1.13.0-rc.1",
|
||||
KubeadmVersion: "v1.13.0-rc.1",
|
||||
DNSType: kubeadmapi.CoreDNS,
|
||||
DNSVersion: "1.3.1",
|
||||
DNSVersion: constants.CoreDNSVersion,
|
||||
EtcdVersion: "3.2.24",
|
||||
},
|
||||
},
|
||||
@ -606,7 +606,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: "v1.12.0-alpha.2",
|
||||
KubeadmVersion: "v1.12.0-alpha.2",
|
||||
DNSType: kubeadmapi.CoreDNS,
|
||||
DNSVersion: "1.3.1",
|
||||
DNSVersion: constants.CoreDNSVersion,
|
||||
EtcdVersion: "3.2.24",
|
||||
},
|
||||
},
|
||||
@ -659,7 +659,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: constants.CurrentKubernetesVersion.WithPatch(1).String(),
|
||||
KubeadmVersion: constants.CurrentKubernetesVersion.WithPatch(1).String(),
|
||||
DNSType: kubeadmapi.CoreDNS,
|
||||
DNSVersion: "1.3.1",
|
||||
DNSVersion: constants.CoreDNSVersion,
|
||||
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
|
||||
},
|
||||
},
|
||||
@ -696,7 +696,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
KubeVersion: constants.CurrentKubernetesVersion.String(),
|
||||
KubeadmVersion: constants.CurrentKubernetesVersion.String(),
|
||||
DNSType: kubeadmapi.CoreDNS,
|
||||
DNSVersion: "1.3.1",
|
||||
DNSVersion: constants.CoreDNSVersion,
|
||||
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
|
||||
},
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user