upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-02-03 20:40:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #134619 from chrischdi/pr-fixup-build-in-kube-cross-kube-git-version-file

Browse source 
build: build by running kube-cross directly should leverage a potential KUBE_GIT_VERSION_FILE
This commit is contained in:
Kubernetes Prow Robot 2025-10-15 17:19:34 -07:00 committed by GitHub
commit fa19b99377
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build/common.sh
View file

@ -61,6 +61,8 @@ KUBE_CROSS_IMAGE="${KUBE_CROSS_IMAGE:-"${KUBE_BASE_IMAGE_REGISTRY}/kube-cross"}"
readonly KUBE_CROSS_IMAGE
KUBE_CROSS_VERSION="${KUBE_CROSS_VERSION:-"${KUBE_BUILD_IMAGE_CROSS_TAG}"}"
readonly KUBE_CROSS_VERSION
KUBE_CROSS_CONTAINER_ROOT="/go/src/k8s.io/kubernetes"
readonly KUBE_CROSS_CONTAINER_ROOT
# Here we map the output directories across both the local and remote _output
# directories:
@ -462,10 +464,10 @@ function kube::build::run_build_command_ex() {
--env "GOGCFLAGS=${GOGCFLAGS:-}"
--env "SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH:-}"
# mount source code / output dir
--volume "${KUBE_ROOT}:/go/src/k8s.io/kubernetes"
--volume "${KUBE_ROOT}:${KUBE_CROSS_CONTAINER_ROOT}"
# env migrated from build-image, we could consider setting this in kube-cross
--env 'KUBE_OUTPUT_SUBPATH=_output/dockerized'
--workdir /go/src/k8s.io/kubernetes
--workdir "${KUBE_CROSS_CONTAINER_ROOT}"
--env 'GIT_AUTHOR_EMAIL=nobody@k8s.io'
--env 'GIT_AUTHOR_NAME=kube-build-image'
)
@ -489,6 +491,12 @@ function kube::build::run_build_command_ex() {
docker_run_opts+=(--cgroup-parent "${DOCKER_CGROUP_PARENT}")
fi
# copy KUBE_GIT_VERSION_FILE to .dockerized-kube-version-defs and set environment variable.
if [[ -n "${KUBE_GIT_VERSION_FILE:-}" ]]; then
cp "${KUBE_GIT_VERSION_FILE}" "${KUBE_ROOT}/.dockerized-kube-version-defs"
docker_run_opts+=(--env "KUBE_GIT_VERSION_FILE=${KUBE_CROSS_CONTAINER_ROOT}/.dockerized-kube-version-defs")
fi
# If we have stdin we can run interactive. This allows things like 'shell.sh'
# to work. However, if we run this way and don't have stdin, then it ends up
# running in a daemon-ish mode. So if we don't have a stdin, we explicitly