From 563c9979393f98597b7a3002af715670ad58e26f Mon Sep 17 00:00:00 2001 From: Di Xu Date: Wed, 16 May 2018 21:53:34 +0800 Subject: [PATCH] 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 --- cmd/kubeadm/app/constants/constants.go | 2 +- cmd/kubeadm/app/constants/constants_test.go | 22 ++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index cd7ff67a6eb..a622a236acb 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -292,9 +292,9 @@ var ( // SupportedEtcdVersion lists officially supported etcd versions with corresponding kubernetes releases SupportedEtcdVersion = map[uint8]string{ - 9: "3.1.12", 10: "3.1.12", 11: "3.2.18", + 12: "3.2.18", } ) diff --git a/cmd/kubeadm/app/constants/constants_test.go b/cmd/kubeadm/app/constants/constants_test.go index 9737c7fdc44..0ab842d3cdd 100644 --- a/cmd/kubeadm/app/constants/constants_test.go +++ b/cmd/kubeadm/app/constants/constants_test.go @@ -126,26 +126,26 @@ func TestEtcdSupportedVersion(t *testing.T) { expectedVersion: nil, 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", expectedVersion: version.MustParseSemantic("3.1.12"), expectedError: nil, }, { - kubernetesVersion: "1.10.1", + kubernetesVersion: "1.10.2", expectedVersion: version.MustParseSemantic("3.1.12"), 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 { actualVersion, actualError := EtcdSupportedVersion(rt.kubernetesVersion)