Merge pull request #51 from rancher/gha-portpr-13395106613-1

[backport release/v2.x] Fix check images bug
rancher · Feb 18, 2025 · a5f99bb · a5f99bb
2 parents 9089bcd + f296334
commit a5f99bb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@
 .idea
 versions.txt
 new-versions.txt
+/image_arch_test
diff --git a/scripts/check-image-binaries b/scripts/check-image-binaries
@@ -23,7 +23,7 @@ verifyKuberlrKubectl() {
       # Pull and extract files
       CONTAINER_ID=$(docker create --platform linux/$ARCH "$IMAGE")
       docker cp "$CONTAINER_ID:/bin/kuberlr" "$ARCH_DIR/kuberlr" 2>&1 > /dev/null || echo "kuberlr not found in $IMAGE for $ARCH"
-      KUBECTL_LIST=$(docker run --rm --entrypoint sh rancher/kuberlr-kubectl:v4.0.1 -c "ls /usr/bin | grep kube")
+      KUBECTL_LIST=$(docker run --rm --entrypoint sh "$IMAGE" -c "ls /usr/bin | grep kube")
       for KUBECTL_VER in $KUBECTL_LIST; do
         docker cp "$CONTAINER_ID:/usr/bin/$KUBECTL_VER" "$ARCH_DIR/$KUBECTL_VER" 2>&1 > /dev/null || echo "kubectl ($KUBECTL_VER) not found in $IMAGE for $ARCH"
       done
@@ -100,5 +100,6 @@ else
   verifyKuberlrKubectl;
 fi
 
+rm -rf "$WORKDIR"
 
-echo "All architectures processed. Check $WORKDIR for results."
+echo "All architectures processed."