From 391e4b58e283b02e2a1721574fc4dd6cce99a108 Mon Sep 17 00:00:00 2001
From: Antonio Ojea <aojea@google.com>
Date: Wed, 24 Apr 2024 13:42:38 +0000
Subject: [PATCH 1/2] 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
 }
 

From 5ed555fb5d561f261af32e4ade6bd50566a9f984 Mon Sep 17 00:00:00 2001
From: Antonio Ojea <aojea@google.com>
Date: Wed, 24 Apr 2024 13:43:02 +0000
Subject: [PATCH 2/2] Revert "Remove _tmp from test/images/image-util.sh"

This reverts commit 2e465cd6fa06165dfb50c0f1c39254203721dae7.
---
 test/images/image-util.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/images/image-util.sh b/test/images/image-util.sh
index baeddbf6324..12c2d3e5933 100755
--- a/test/images/image-util.sh
+++ b/test/images/image-util.sh
@@ -127,7 +127,8 @@ build() {
 
     # Create a temporary directory for every architecture and copy the image content
     # and build the image from temporary directory
-    temp_dir="$(kube::realpath "$(mktemp -d -t "$(basename "$0").XXXXXX")")"
+    mkdir -p "${KUBE_ROOT}"/_tmp
+    temp_dir=$(mktemp -d "${KUBE_ROOT}"/_tmp/test-images-build.XXXXXX)
     kube::util::trap_add "rm -rf ${temp_dir}" EXIT
 
     cp -r "${img_folder}"/* "${temp_dir}"