From cef43e115509b7ed2174bc32e37e950163c2412d Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 13 Sep 2023 10:39:22 +0200 Subject: [PATCH] build: update s5cmd to version v2.2.1 This is the latest available version. The previously used version v2.0.0 was very outdated. Fixes: #12883 Co-authored-by: subham rai subhamkrai Signed-off-by: Michael Adam Signed-off-by: Subham Rai subhamkrai signed-off-by: Travis Nielsen Co-authored-by: Travis Nielsen --- .github/workflows/canary-integration-test.yml | 9 +++++++++ images/ceph/Makefile | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/canary-integration-test.yml b/.github/workflows/canary-integration-test.yml index 6d88f4072..1ded4f0f0 100644 --- a/.github/workflows/canary-integration-test.yml +++ b/.github/workflows/canary-integration-test.yml @@ -305,6 +305,15 @@ jobs: # waiting for toolbox operator image pod to get ready kubectl -n rook-ceph wait --for=condition=ready pod -l app=rook-ceph-tools-operator-image --timeout=180s + - name: check s5cmd version in the toolbox image + run: | + toolbox=$(kubectl get pod -l app=rook-ceph-tools-operator-image -n rook-ceph -o jsonpath='{.items[*].metadata.name}') + s5cmd_version="$(kubectl -n rook-ceph exec ${toolbox} -- /usr/local/bin/s5cmd version)" + echo ${s5cmd_version} | grep -q "^v2.2.1" || { + echo " Error: the version of s5cmd version in the toolbox is not the expected v2.2.1 but ${s5cmd_version}" + exit 1 + } + - name: check-ownerreferences run: tests/scripts/github-action-helper.sh check_ownerreferences diff --git a/images/ceph/Makefile b/images/ceph/Makefile index 38fcc8ca9..e8e6033cf 100755 --- a/images/ceph/Makefile +++ b/images/ceph/Makefile @@ -57,7 +57,7 @@ $(info ) endif # s5cmd's version -S5CMD_VERSION = 2.0.0 +S5CMD_VERSION = 2.2.1 OPERATOR_SDK := $(TOOLS_HOST_DIR)/operator-sdk-$(OPERATOR_SDK_VERSION) YQv3 := $(TOOLS_HOST_DIR)/yq-$(YQv3_VERSION)