From cd605e7d1493008828e11ca0d0bdefe337c55e7c Mon Sep 17 00:00:00 2001 From: Yago Nobre Date: Wed, 3 Apr 2019 01:28:07 -0300 Subject: [PATCH] Simplify kubeadm bump version on TestEtcdSupportedVersion --- cmd/kubeadm/app/constants/constants_test.go | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/cmd/kubeadm/app/constants/constants_test.go b/cmd/kubeadm/app/constants/constants_test.go index 99e8f236cd..95377623f4 100644 --- a/cmd/kubeadm/app/constants/constants_test.go +++ b/cmd/kubeadm/app/constants/constants_test.go @@ -160,18 +160,13 @@ func TestEtcdSupportedVersion(t *testing.T) { expectedError: errors.New("Unsupported or unknown Kubernetes version(1.99.0)"), }, { - kubernetesVersion: "1.12.1", - expectedVersion: version.MustParseSemantic("3.2.24"), + kubernetesVersion: MinimumControlPlaneVersion.WithPatch(1).String(), + expectedVersion: version.MustParseSemantic(SupportedEtcdVersion[uint8(MinimumControlPlaneVersion.Minor())]), expectedError: nil, }, { - kubernetesVersion: "1.13.1", - expectedVersion: version.MustParseSemantic("3.2.24"), - expectedError: nil, - }, - { - kubernetesVersion: "1.14.0", - expectedVersion: version.MustParseSemantic("3.3.10"), + kubernetesVersion: CurrentKubernetesVersion.String(), + expectedVersion: version.MustParseSemantic(SupportedEtcdVersion[uint8(CurrentKubernetesVersion.Minor())]), expectedError: nil, }, }