Merge pull request #12898 from obnoxxx/update-s5cmd

build: update s5cmd to version v2.2.1
rook · Sep 15, 2023 · 0bca2ce · 0bca2ce
2 parents 8da6dea + cef43e1
commit 0bca2ce
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git 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
@@ -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)