From a8db05e5b60de6a06da8f44853d25a2e249fe0a2 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 14 Jan 2025 19:05:11 +0100 Subject: [PATCH 1/2] build: move a Makefile comment to a more appropriate place in the image building Makefile, a comment explaining the construction of the operator-sdk download URL was in a wrong place. Now it is moved to the lines that it actually explains. Signed-off-by: Michael Adam (cherry picked from commit 0649cd38acda6508bc1a508575e44509b0d7ef42) --- images/ceph/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/ceph/Makefile b/images/ceph/Makefile index e2aaa7880..c97f6078c 100755 --- a/images/ceph/Makefile +++ b/images/ceph/Makefile @@ -35,14 +35,14 @@ ifeq ($(BUILD_CONTEXT_DIR),) BUILD_CONTEXT_DIR := $(shell mktemp -d) endif -# Note: as of version 1.3 of operator-sdk, the url format changed to: -# ${OPERATOR_SDK_DL_URL}/operator-sdk_${OS}_${ARCH} -# (see: https://sdk.operatorframework.io/docs/installation/) S5CMD_ARCH = Linux-64bit # s5cmd's version S5CMD_VERSION = 2.3.0 +# Note: as of version 1.3 of operator-sdk, the url format changed to: +# ${OPERATOR_SDK_DL_URL}/operator-sdk_${OS}_${ARCH} +# (see: https://sdk.operatorframework.io/docs/installation/) OPERATOR_SDK := $(TOOLS_HOST_DIR)/operator-sdk-$(OPERATOR_SDK_VERSION) YQv3 := $(TOOLS_HOST_DIR)/yq-$(YQv3_VERSION) export OPERATOR_SDK YQv3 From 86479cd9b92ff71ad3992bd83f4376b534c0c444 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 14 Jan 2025 19:17:06 +0100 Subject: [PATCH 2/2] build: fix S5CMD_ARCH calculation In image building, when building on arm based systems, the s5cmd tool was added with the wrong architecture (amd64 instead of arm64). This change fixes the architecture of the s5cmd to match the architecture of the image built. Fixes: #15262 Signed-off-by: Michael Adam (cherry picked from commit e34c41ce2c58b1452fd7afa46b1143cf6ab12c6f) --- images/ceph/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/images/ceph/Makefile b/images/ceph/Makefile index c97f6078c..70522d92e 100755 --- a/images/ceph/Makefile +++ b/images/ceph/Makefile @@ -35,7 +35,12 @@ ifeq ($(BUILD_CONTEXT_DIR),) BUILD_CONTEXT_DIR := $(shell mktemp -d) endif + +ifeq ($(GOARCH),amd64) S5CMD_ARCH = Linux-64bit +else +S5CMD_ARCH = Linux-arm64 +endif # s5cmd's version S5CMD_VERSION = 2.3.0