From ab3bd32d221f0602f74bc3e5fec22fc2179a2e8b Mon Sep 17 00:00:00 2001
From: Claudiu Belu <cbelu@cloudbasesolutions.com>
Date: Wed, 20 Jan 2021 13:35:01 +0000
Subject: [PATCH] test images: Fixes metadata-concealment image building

The metadata-concealment image does not have any BASEIMAGE file, which means
that the image will be built from scratch. In this case, there are a few
fixes that need to be made in the image-build.sh script.
---
 test/images/image-util.sh                   | 26 ++++++++++-----------
 test/images/metadata-concealment/Dockerfile |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/test/images/image-util.sh b/test/images/image-util.sh
index 14761cff96d..22f048d8072 100755
--- a/test/images/image-util.sh
+++ b/test/images/image-util.sh
@@ -96,7 +96,7 @@ build() {
     os_archs=$(listOsArchs "$image")
   else
     # prepend linux/ to the QEMUARCHS items.
-    os_archs=$(printf 'linux/%s\n' "${!QEMUARCHS[*]}")
+    os_archs=$(printf 'linux/%s\n' "${!QEMUARCHS[@]}")
   fi
 
   kube::util::ensure-gnu-sed
@@ -126,17 +126,17 @@ build() {
     # image tag
     TAG=$(<VERSION)
 
+    # NOTE(claudiub): Some Windows images might require their own Dockerfile
+    # while simpler ones will not. If we're building for Windows, check if
+    # "Dockerfile_windows" exists or not.
+    dockerfile_name="Dockerfile"
+    if [[ "$os_name" = "windows" && -f "Dockerfile_windows" ]]; then
+      dockerfile_name="Dockerfile_windows"
+    fi
+
+    base_image=""
     if [[ -f BASEIMAGE ]]; then
-      BASEIMAGE=$(getBaseImage "${os_arch}" | ${SED} "s|REGISTRY|${REGISTRY}|g")
-
-      # NOTE(claudiub): Some Windows images might require their own Dockerfile
-      # while simpler ones will not. If we're building for Windows, check if
-      # "Dockerfile_windows" exists or not.
-      dockerfile_name="Dockerfile"
-      if [[ "$os_name" = "windows" && -f "Dockerfile_windows" ]]; then
-        dockerfile_name="Dockerfile_windows"
-      fi
-
+      base_image=$(getBaseImage "${os_arch}" | ${SED} "s|REGISTRY|${REGISTRY}|g")
       ${SED} -i "s|BASEARCH|${arch}|g" $dockerfile_name
     fi
 
@@ -161,7 +161,7 @@ build() {
     fi
 
     docker buildx build --no-cache --pull --output=type="${output_type}" --platform "${os_name}/${arch}" \
-        --build-arg BASEIMAGE="${BASEIMAGE}" --build-arg REGISTRY="${REGISTRY}" --build-arg OS_VERSION="${os_version}" \
+        --build-arg BASEIMAGE="${base_image}" --build-arg REGISTRY="${REGISTRY}" --build-arg OS_VERSION="${os_version}" \
         -t "${REGISTRY}/${image}:${TAG}-${suffix}" -f "${dockerfile_name}" .
 
     popd
@@ -187,7 +187,7 @@ push() {
     os_archs=$(listOsArchs "$image")
   else
     # prepend linux/ to the QEMUARCHS items.
-    os_archs=$(printf 'linux/%s\n' "${!QEMUARCHS[*]}")
+    os_archs=$(printf 'linux/%s\n' "${!QEMUARCHS[@]}")
   fi
 
   kube::util::ensure-gnu-sed
diff --git a/test/images/metadata-concealment/Dockerfile b/test/images/metadata-concealment/Dockerfile
index e3e3053240c..76765e25f08 100644
--- a/test/images/metadata-concealment/Dockerfile
+++ b/test/images/metadata-concealment/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2016 The Kubernetes Authors.
+# Copyright 2021 The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.