From 391e4b58e283b02e2a1721574fc4dd6cce99a108 Mon Sep 17 00:00:00 2001 From: Antonio Ojea Date: Wed, 24 Apr 2024 13:42:38 +0000 Subject: [PATCH] Revert "added init to image-utils.sh" This reverts commit 7951d7975e9d34b213b15fbc02debf02f5086f7e. --- test/images/image-util.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/test/images/image-util.sh b/test/images/image-util.sh index 2a1599971c1..baeddbf6324 100755 --- a/test/images/image-util.sh +++ b/test/images/image-util.sh @@ -30,7 +30,6 @@ export DOCKER_CLI_EXPERIMENTAL="enabled" DOCKER_CERT_BASE_PATH="${DOCKER_CERT_BASE_PATH:-${HOME}}" KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)" -source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/logging.sh" source "${KUBE_ROOT}/hack/lib/util.sh" @@ -266,16 +265,11 @@ bin() { fi for SRC in "$@"; do - local -r target=${TARGET:-} - if [[ -z "${target}" ]]; then - echo "TARGET is not set" - exit 1 - fi - docker run --rm -v "${target}:${target}:Z" -v "${KUBE_ROOT}":/go/src/k8s.io/kubernetes:Z \ + docker run --rm -v "${TARGET}:${TARGET}:Z" -v "${KUBE_ROOT}":/go/src/k8s.io/kubernetes:Z \ golang:"${GOLANG_VERSION}" \ /bin/bash -c "\ cd /go/src/k8s.io/kubernetes/test/images/${SRC_DIR} && \ - CGO_ENABLED=0 ${arch_prefix} GOOS=${OS} GOARCH=${ARCH} go build -a -installsuffix cgo --ldflags \"-w ${LD_FLAGS:-}\" -o ${target}/${SRC} ./$(dirname "${SRC}")" + CGO_ENABLED=0 ${arch_prefix} GOOS=${OS} GOARCH=${ARCH} go build -a -installsuffix cgo --ldflags \"-w ${LD_FLAGS:-}\" -o ${TARGET}/${SRC} ./$(dirname "${SRC}")" done }