Skip to content

K
k3s
Unverified Commit 82e15dad authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

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

Simplify kubeadm bump version on TestEtcdSupportedVersion
parents 02ffdd1d cd605e7d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 9 deletions
cmd/kubeadm/app/constants/constants_test.go
View file @ 82e15dad
...@@ -160,18 +160,13 @@ func TestEtcdSupportedVersion(t *testing.T) { ...@@ -160,18 +160,13 @@ func TestEtcdSupportedVersion(t *testing.T) {
expectedError: errors.New("Unsupported or unknown Kubernetes version(1.99.0)"), expectedError: errors.New("Unsupported or unknown Kubernetes version(1.99.0)"),
}, },
{ {
kubernetesVersion: "1.12.1", kubernetesVersion: MinimumControlPlaneVersion.WithPatch(1).String(),
expectedVersion: version.MustParseSemantic("3.2.24"), expectedVersion: version.MustParseSemantic(SupportedEtcdVersion[uint8(MinimumControlPlaneVersion.Minor())]),
expectedError: nil, expectedError: nil,
}, },
{ {
kubernetesVersion: "1.13.1", kubernetesVersion: CurrentKubernetesVersion.String(),
expectedVersion: version.MustParseSemantic("3.2.24"), expectedVersion: version.MustParseSemantic(SupportedEtcdVersion[uint8(CurrentKubernetesVersion.Minor())]),
expectedError: nil,
},
{
kubernetesVersion: "1.14.0",
expectedVersion: version.MustParseSemantic("3.3.10"),
expectedError: nil, expectedError: nil,
}, },
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment