Merge pull request #76068 from yagonobre/simplify-version-bump

Simplify kubeadm bump version on TestEtcdSupportedVersion
This commit is contained in:
Kubernetes Prow Robot 2019-04-16 00:51:08 -07:00 committed by GitHub
commit 82e15dad1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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,
},
}