From dff56d8246a481b163e1f49477efef324a106334 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Tue, 6 Aug 2024 10:13:37 -0400 Subject: [PATCH] chore: remove arch-specific etcd image tag The main etcd tag is now multiarch so the special case isn't needed. Signed-off-by: Steven Fackler Signed-off-by: Andrey Smirnov --- .../config/types/v1alpha1/v1alpha1_etcdconfig.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkg/machinery/config/types/v1alpha1/v1alpha1_etcdconfig.go b/pkg/machinery/config/types/v1alpha1/v1alpha1_etcdconfig.go index d090279253..7994b70d4b 100644 --- a/pkg/machinery/config/types/v1alpha1/v1alpha1_etcdconfig.go +++ b/pkg/machinery/config/types/v1alpha1/v1alpha1_etcdconfig.go @@ -6,7 +6,6 @@ package v1alpha1 import ( "fmt" - goruntime "runtime" "github.com/siderolabs/crypto/x509" @@ -16,14 +15,9 @@ import ( // Image implements the config.Etcd interface. func (e *EtcdConfig) Image() string { image := e.ContainerImage - suffix := "" - - if goruntime.GOARCH == "arm64" { - suffix = "-arm64" - } if image == "" { - image = fmt.Sprintf("%s:%s%s", constants.EtcdImage, constants.DefaultEtcdVersion, suffix) + image = fmt.Sprintf("%s:%s", constants.EtcdImage, constants.DefaultEtcdVersion) } return image