From 309ea4e80208d123b07625e21de2ca4859ea210f Mon Sep 17 00:00:00 2001 From: Yassine TIJANI Date: Wed, 3 Jul 2019 15:39:13 +0200 Subject: [PATCH] consolidate coreDNS version to ease dependency bump Signed-off-by: Yassine TIJANI --- .../app/phases/upgrade/compute_test.go | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/cmd/kubeadm/app/phases/upgrade/compute_test.go b/cmd/kubeadm/app/phases/upgrade/compute_test.go index 74c0de4e7ba..1b5a41a02fd 100644 --- a/cmd/kubeadm/app/phases/upgrade/compute_test.go +++ b/cmd/kubeadm/app/phases/upgrade/compute_test.go @@ -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), }, },