From 4ecb4670cc7ec6dc559db48fd5e404dee7bad4c0 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Sun, 22 Jan 2023 19:27:25 -0500 Subject: [PATCH] Remove unnecessary ETCD_UNSUPPORTED_ARCH for arm64 we should only use this env var for `arm`, since `arm64` is fully supported by etcd folks, let us drop this! (ex - https://github.com/etcd-io/etcd/releases/tag/v3.5.6) ppc64le comment should be dropped as well Signed-off-by: Davanum Srinivas --- cluster/images/etcd/Makefile | 8 ++++---- hack/lib/etcd.sh | 4 +--- test/integration/framework/etcd.go | 5 ----- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 62568d640f5..dd151f70f47 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -179,10 +179,10 @@ else done # Add this ENV variable in order to workaround an unsupported arch blocker - # The multiarch feature is in an limited and experimental state right now, and etcd should work fine on arm64 - # On arm (which is 32-bit), it can't handle >1GB data in-memory, but it is very unlikely someone tinkering with their limited arm devices would reach such a high usage - # ppc64le is still quite untested, but compiles and is probably in the process of being validated by IBM. - cd $(TEMP_DIR) && echo "ENV ETCD_UNSUPPORTED_ARCH=$(ARCH)" >> $(DOCKERFILE) + # On arm (which is 32-bit), it can't handle >1GB data in-memory + ifeq ($(ARCH),arm) + cd $(TEMP_DIR) && echo "ENV ETCD_UNSUPPORTED_ARCH=$(ARCH)" >> $(DOCKERFILE) + endif endif docker run --rm --privileged multiarch/qemu-user-static:$(QEMUVERSION) --reset -p yes diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh index b3eebeab87a..46cbecae6f9 100755 --- a/hack/lib/etcd.sh +++ b/hack/lib/etcd.sh @@ -51,9 +51,7 @@ kube::etcd::validate() { # need set the env of "ETCD_UNSUPPORTED_ARCH" on unstable arch. arch=$(uname -m) - if [[ $arch =~ aarch* ]]; then - export ETCD_UNSUPPORTED_ARCH=arm64 - elif [[ $arch =~ arm* ]]; then + if [[ $arch =~ arm* ]]; then export ETCD_UNSUPPORTED_ARCH=arm fi # validate installed version is at least equal to minimum diff --git a/test/integration/framework/etcd.go b/test/integration/framework/etcd.go index f0919106d29..e0fcff1007c 100644 --- a/test/integration/framework/etcd.go +++ b/test/integration/framework/etcd.go @@ -24,7 +24,6 @@ import ( "net" "os" "os/exec" - "runtime" "strings" "syscall" "time" @@ -64,10 +63,6 @@ func getAvailablePort() (int, error) { // startEtcd executes an etcd instance. The returned function will signal the // etcd process and wait for it to exit. func startEtcd() (func(), error) { - if runtime.GOARCH == "arm64" { - os.Setenv("ETCD_UNSUPPORTED_ARCH", "arm64") - } - etcdURL := env.GetEnvAsStringOrFallback("KUBE_INTEGRATION_ETCD_URL", "http://127.0.0.1:2379") conn, err := net.Dial("tcp", strings.TrimPrefix(etcdURL, "http://")) if err == nil {