github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Bump etcd version based on k8s version to 1.10.X => 3.1.12, 1.11.X => 3.2.18, 1.12.X => 3.2.18

Browse Source
This commit is contained in:
Di Xu 2018-05-16 21:53:34 +08:00
parent fcc335c880
commit 563c997939
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/constants/constants.go
View File

@ -292,9 +292,9 @@ var (
// SupportedEtcdVersion lists officially supported etcd versions with corresponding kubernetes releases // SupportedEtcdVersion lists officially supported etcd versions with corresponding kubernetes releases
SupportedEtcdVersion = map[uint8]string{ SupportedEtcdVersion = map[uint8]string{
9: "3.1.12",
10: "3.1.12", 10: "3.1.12",
11: "3.2.18", 11: "3.2.18",
12: "3.2.18",
} }
) )

22
cmd/kubeadm/app/constants/constants_test.go
View File

@ -126,26 +126,26 @@ func TestEtcdSupportedVersion(t *testing.T) {
expectedVersion: nil, expectedVersion: nil,
expectedError: fmt.Errorf("Unsupported or unknown kubernetes version(1.99.0)"), expectedError: fmt.Errorf("Unsupported or unknown kubernetes version(1.99.0)"),
}, },
{
kubernetesVersion: "1.9.0",
expectedVersion: version.MustParseSemantic("3.1.12"),
expectedError: nil,
},
{
kubernetesVersion: "1.9.2",
expectedVersion: version.MustParseSemantic("3.1.12"),
expectedError: nil,
},
{ {
kubernetesVersion: "1.10.0", kubernetesVersion: "1.10.0",
expectedVersion: version.MustParseSemantic("3.1.12"), expectedVersion: version.MustParseSemantic("3.1.12"),
expectedError: nil, expectedError: nil,
}, },
{ {
kubernetesVersion: "1.10.1", kubernetesVersion: "1.10.2",
expectedVersion: version.MustParseSemantic("3.1.12"), expectedVersion: version.MustParseSemantic("3.1.12"),
expectedError: nil, expectedError: nil,
}, },
{
kubernetesVersion: "1.11.0",
expectedVersion: version.MustParseSemantic("3.2.18"),
expectedError: nil,
},
{
kubernetesVersion: "1.12.1",
expectedVersion: version.MustParseSemantic("3.2.18"),
expectedError: nil,
},
} }
for _, rt := range tests { for _, rt := range tests {
actualVersion, actualError := EtcdSupportedVersion(rt.kubernetesVersion) actualVersion, actualError := EtcdSupportedVersion(rt.kubernetesVersion)