From 4c2b0731cbd088b5bf4cc44c4a26d3b91a1bbffa Mon Sep 17 00:00:00 2001 From: Joe Betz Date: Wed, 4 Sep 2019 15:37:14 -0700 Subject: [PATCH] Simplify etcd image version usage in kubeadm --- cmd/kubeadm/app/constants/constants.go | 6 +----- cmd/kubeadm/app/images/images.go | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index cfe77b9b377..8cd287f31e3 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -260,11 +260,7 @@ const ( MinExternalEtcdVersion = "3.2.18" // DefaultEtcdVersion indicates the default etcd version that kubeadm uses - DefaultEtcdVersion = "3.3.15" - - // DefaultEtcdImageVersion indicates the etcd image version that kubeadm uses. - // For example, the image version of "k8s.gcr.io/etcd:3.3.15-0" is "0". - DefaultEtcdImageVersion = "0" + DefaultEtcdVersion = "3.3.15-0" // PauseVersion indicates the default pause image version for kubeadm PauseVersion = "3.1" diff --git a/cmd/kubeadm/app/images/images.go b/cmd/kubeadm/app/images/images.go index de5fb481250..33ca05015a6 100644 --- a/cmd/kubeadm/app/images/images.go +++ b/cmd/kubeadm/app/images/images.go @@ -68,7 +68,7 @@ func GetEtcdImage(cfg *kubeadmapi.ClusterConfiguration) string { etcdImageRepository = cfg.Etcd.Local.ImageRepository } // Etcd uses an imageTag that corresponds to the etcd version matching the Kubernetes version - etcdImageTag := fmt.Sprintf("%s-%s", constants.DefaultEtcdVersion, constants.DefaultEtcdImageVersion) + etcdImageTag := constants.DefaultEtcdVersion etcdVersion, err := constants.EtcdSupportedVersion(cfg.KubernetesVersion) if err == nil { etcdImageTag = etcdVersion.String()