Skip to content

Commit 5639e1f

Browse files
authored
Merge pull request kubernetes#130870 from Rajalakshmi-Girish/kube-build-image-tag
Fix KUBE_BUILD_IMAGE_CROSS_TAG mismatch when KUBE_CROSS_VERSION is passed
2 parents aba6aa4 + 5402baf commit 5639e1f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

build/common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
3939

4040
# Constants
4141
readonly KUBE_BUILD_IMAGE_REPO=kube-build
42-
KUBE_BUILD_IMAGE_CROSS_TAG="$(cat "${KUBE_ROOT}/build/build-image/cross/VERSION")"
42+
KUBE_BUILD_IMAGE_CROSS_TAG="${KUBE_CROSS_VERSION:-"$(cat "${KUBE_ROOT}/build/build-image/cross/VERSION")"}"
4343
readonly KUBE_BUILD_IMAGE_CROSS_TAG
4444

4545
readonly KUBE_DOCKER_REGISTRY="${KUBE_DOCKER_REGISTRY:-registry.k8s.io}"

0 commit comments

Comments
 (0)