Merge pull request #120100 from ruquanzhao/fixFindReleaseTars

Support multiarch/platfrom in find-release-tars
This commit is contained in:
Kubernetes Prow Robot 2023-08-22 17:36:22 -07:00 committed by GitHub
commit fb785f1f42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -328,7 +328,12 @@ function find-tar() {
# SERVER_BINARY_TAR
# KUBE_MANIFESTS_TAR
function find-release-tars() {
SERVER_BINARY_TAR=$(find-tar kubernetes-server-linux-amd64.tar.gz)
# Use first item in KUBE_BUILD_PLATFORMS as server platform
KUBE_BUILD_PLATFORMS=${KUBE_BUILD_PLATFORMS:-"linux/amd64"}
SERVER_PLATFORM=$(cut -d' ' -f1 <<< "${KUBE_BUILD_PLATFORMS}")
OS=$(cut -d'/' -f1 <<< "${SERVER_PLATFORM}")
ARCH=$(cut -d'/' -f2 <<< "${SERVER_PLATFORM}")
SERVER_BINARY_TAR=$(find-tar kubernetes-server-"${OS}"-"${ARCH}".tar.gz)
if [[ -z "${SERVER_BINARY_TAR}" ]]; then
exit 1
fi
@ -336,7 +341,7 @@ function find-release-tars() {
local find_result
if [[ "${NUM_WINDOWS_NODES}" -gt "0" ]]; then
if NODE_BINARY_TAR=$(find-tar kubernetes-node-windows-amd64.tar.gz); then
if NODE_BINARY_TAR=$(find-tar kubernetes-node-windows-"${ARCH}".tar.gz); then
find_result=0
else
find_result=1