From 605f402d44adc88213509390e5180923ca9a3fb1 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Wed, 15 Oct 2025 13:12:38 -0700 Subject: [PATCH] use relative symlink for output path resolves issues with creating symlinks inside the build container via bind mount instead of rsync-ing them out --- hack/lib/golang.sh | 2 +- hack/lib/init.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh index bb7a7a697de..e50dc85d696 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -661,7 +661,7 @@ kube::golang::place_bins() { platform_src="" rm -f "${THIS_PLATFORM_BIN}" mkdir -p "$(dirname "${THIS_PLATFORM_BIN}")" - ln -s "${KUBE_OUTPUT_BIN}/${platform}" "${THIS_PLATFORM_BIN}" + ln -s "../${_KUBE_OUTPUT_SUBPATH}/${_KUBE_OUTPUT_BIN_SUBPATH}/${platform}" "${THIS_PLATFORM_BIN}" fi V=3 kube::log::status "Placing binaries for ${platform} in ${KUBE_OUTPUT_BIN}/${platform}" diff --git a/hack/lib/init.sh b/hack/lib/init.sh index 083cf91d2cd..f315be3a9fb 100755 --- a/hack/lib/init.sh +++ b/hack/lib/init.sh @@ -41,7 +41,8 @@ KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)" # If it is specified, we'll use it in KUBE_OUTPUT. _KUBE_OUTPUT_SUBPATH="${KUBE_OUTPUT_SUBPATH:-_output/local}" export KUBE_OUTPUT="${KUBE_ROOT}/${_KUBE_OUTPUT_SUBPATH}" -export KUBE_OUTPUT_BIN="${KUBE_OUTPUT}/bin" +readonly _KUBE_OUTPUT_BIN_SUBPATH="bin" +export KUBE_OUTPUT_BIN="${KUBE_OUTPUT}/${_KUBE_OUTPUT_BIN_SUBPATH}" export THIS_PLATFORM_BIN="${KUBE_ROOT}/_output/bin" # This controls rsync compression. Set to a value > 0 to enable rsync