github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #117921 from kkkkun/clean-up-etcd-version

Browse Source 
clean up unsupport etcd version
This commit is contained in:
Kubernetes Prow Robot
2023-05-18 20:30:28 -07:00
committed by GitHub
parent 6aa4261405 8b4840aa37
commit 15a1f9a39d
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/images/etcd/Makefile
View File

@@ -15,7 +15,7 @@
# Build the etcd image # Build the etcd image
# #
# Usage: # Usage:
# [BUNDLED_ETCD_VERSIONS=3.0.17 3.1.20 3.2.32 3.3.17 3.4.18 3.5.8] [REGISTRY=registry.k8s.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push) # [BUNDLED_ETCD_VERSIONS=3.4.18 3.5.8] [REGISTRY=registry.k8s.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
# #
# The image contains different etcd versions to simplify # The image contains different etcd versions to simplify
# upgrades. Thus be careful when removing any versions from here. # upgrades. Thus be careful when removing any versions from here.
@@ -26,7 +26,7 @@
# Except from etcd-$(version) and etcdctl-$(version) binaries, we also # Except from etcd-$(version) and etcdctl-$(version) binaries, we also
# need etcd and etcdctl binaries for backward compatibility reasons. # need etcd and etcdctl binaries for backward compatibility reasons.
# That binary will be set to the last version from $(BUNDLED_ETCD_VERSIONS). # That binary will be set to the last version from $(BUNDLED_ETCD_VERSIONS).
BUNDLED_ETCD_VERSIONS?=3.0.17 3.1.20 3.2.32 3.3.17 3.4.18 3.5.9 BUNDLED_ETCD_VERSIONS?=3.4.18 3.5.8
# LATEST_ETCD_VERSION identifies the most recent etcd version available. # LATEST_ETCD_VERSION identifies the most recent etcd version available.
LATEST_ETCD_VERSION?=3.5.9 LATEST_ETCD_VERSION?=3.5.9

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

@@ -306,7 +306,7 @@ const (
KubeletHealthzPort = 10248 KubeletHealthzPort = 10248
// MinExternalEtcdVersion indicates minimum external etcd version which kubeadm supports // MinExternalEtcdVersion indicates minimum external etcd version which kubeadm supports
MinExternalEtcdVersion = "3.2.18" MinExternalEtcdVersion = "3.4.3-0"
// DefaultEtcdVersion indicates the default etcd version that kubeadm uses // DefaultEtcdVersion indicates the default etcd version that kubeadm uses
DefaultEtcdVersion = "3.5.9-0" DefaultEtcdVersion = "3.5.9-0"
@@ -467,15 +467,11 @@ 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{
13: "3.2.24",
14: "3.3.10",
15: "3.3.10",
16: "3.3.17-0",
17: "3.4.3-0", 17: "3.4.3-0",
18: "3.4.3-0", 18: "3.4.3-0",
19: "3.4.13-0", 19: "3.4.18-0",
20: "3.4.13-0", 20: "3.4.18-0",
21: "3.4.13-0", 21: "3.4.18-0",
22: "3.5.8-0", 22: "3.5.8-0",
23: "3.5.8-0", 23: "3.5.8-0",
24: "3.5.8-0", 24: "3.5.8-0",

10
cmd/kubeadm/app/images/images_test.go
View File

@@ -104,17 +104,17 @@ func TestGetEtcdImage(t *testing.T) {
{ {
cfg: &kubeadmapi.ClusterConfiguration{ cfg: &kubeadmapi.ClusterConfiguration{
ImageRepository: "real.repo", ImageRepository: "real.repo",
KubernetesVersion: "1.16.0", KubernetesVersion: "1.18.0",
Etcd: kubeadmapi.Etcd{ Etcd: kubeadmapi.Etcd{
Local: &kubeadmapi.LocalEtcd{}, Local: &kubeadmapi.LocalEtcd{},
}, },
}, },
expected: "real.repo/etcd:3.3.17-0", expected: "real.repo/etcd:3.4.3-0",
}, },
{ {
cfg: &kubeadmapi.ClusterConfiguration{ cfg: &kubeadmapi.ClusterConfiguration{
ImageRepository: "real.repo", ImageRepository: "real.repo",
KubernetesVersion: "1.16.0", KubernetesVersion: "1.18.0",
Etcd: kubeadmapi.Etcd{ Etcd: kubeadmapi.Etcd{
Local: &kubeadmapi.LocalEtcd{ Local: &kubeadmapi.LocalEtcd{
ImageMeta: kubeadmapi.ImageMeta{ ImageMeta: kubeadmapi.ImageMeta{
@@ -128,7 +128,7 @@ func TestGetEtcdImage(t *testing.T) {
{ {
cfg: &kubeadmapi.ClusterConfiguration{ cfg: &kubeadmapi.ClusterConfiguration{
ImageRepository: "real.repo", ImageRepository: "real.repo",
KubernetesVersion: "1.16.0", KubernetesVersion: "1.18.0",
Etcd: kubeadmapi.Etcd{ Etcd: kubeadmapi.Etcd{
Local: &kubeadmapi.LocalEtcd{ Local: &kubeadmapi.LocalEtcd{
ImageMeta: kubeadmapi.ImageMeta{ ImageMeta: kubeadmapi.ImageMeta{
@@ -137,7 +137,7 @@ func TestGetEtcdImage(t *testing.T) {
}, },
}, },
}, },
expected: "override/etcd:3.3.17-0", expected: "override/etcd:3.4.3-0",
}, },
{ {
expected: GetGenericImage(gcrPrefix, "etcd", constants.DefaultEtcdVersion), expected: GetGenericImage(gcrPrefix, "etcd", constants.DefaultEtcdVersion),