test images: Adds dockerhub images for mirroring

Dockerhub will introduce rate limiting in November, and a lot of E2E tests
are relying on the busybox image. It could potentially become an issue
causing jobs to fail because of this.

Ideally, we'd have the busybox image mirrored on gcr.io, but that could take
some time. Until then, we can just have the Image Builder mirror the image
for us in the staging registry and use that for tests until this issue is
solved. The busybox image should NOT be promoted out of staging.

During the sig-testing meeting, it was decided that we should do the same
for the other images are hosted on dockerhub.

Two different versions of httpd and nginx have to be built, and thus, the have
different folders. An ALIAS file was added to httpd-new and nginx-new in order
to keep the same image name.

test/images/busybox/BASEIMAGE

@@ -1,3 +1,8 @@
+linux/amd64=busybox:1.29
+linux/arm=arm32v6/busybox:1.29
+linux/arm64=arm64v8/busybox:1.29
+linux/ppc64le=ppc64le/busybox:1.29
+linux/s390x=s390x/busybox:1.29
 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
 windows/amd64/1903=mcr.microsoft.com/windows/nanoserver:1903
 windows/amd64/1909=mcr.microsoft.com/windows/nanoserver:1909

test/images/busybox/Dockerfile

@@ -0,0 +1,17 @@
+# Copyright 2020 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# NOTE(claudiub): Noop. We're just mirroring the image to staging.
+ARG BASEIMAGE
+FROM $BASEIMAGE

test/images/glusterdynamic-provisioner/BASEIMAGE

@@ -0,0 +1 @@
+linux/amd64=docker.io/gluster/glusterdynamic-provisioner:v1.0

test/images/glusterdynamic-provisioner/Dockerfile

@@ -0,0 +1,17 @@
+# Copyright 2020 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# NOTE(claudiub): Noop. We're just mirroring the image to staging.
+ARG BASEIMAGE
+FROM $BASEIMAGE

test/images/glusterdynamic-provisioner/VERSION

@@ -0,0 +1 @@
+v1.0

test/images/httpd-new/ALIAS

@@ -0,0 +1 @@
+httpd

test/images/httpd-new/BASEIMAGE

@@ -0,0 +1,5 @@
+linux/amd64=httpd:2.4.39-alpine
+linux/arm=arm32v6/httpd:2.4.39-alpine
+linux/arm64=arm64v8/httpd:2.4.39-alpine
+linux/ppc64le=ppc64le/httpd:2.4.39-alpine
+linux/s390x=s390x/httpd:2.4.39-alpine

test/images/httpd-new/Dockerfile

@@ -0,0 +1,17 @@
+# Copyright 2020 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# NOTE(claudiub): Noop. We're just mirroring the image to staging.
+ARG BASEIMAGE
+FROM $BASEIMAGE

test/images/httpd-new/VERSION

@@ -0,0 +1 @@
+2.4.39-alpine

test/images/httpd/BASEIMAGE

@@ -0,0 +1,5 @@
+linux/amd64=httpd:2.4.38-alpine
+linux/arm=arm32v6/httpd:2.4.38-alpine
+linux/arm64=arm64v8/httpd:2.4.38-alpine
+linux/ppc64le=ppc64le/httpd:2.4.38-alpine
+linux/s390x=s390x/httpd:2.4.38-alpine

test/images/httpd/Dockerfile

@@ -0,0 +1,17 @@
+# Copyright 2020 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# NOTE(claudiub): Noop. We're just mirroring the image to staging.
+ARG BASEIMAGE
+FROM $BASEIMAGE

test/images/httpd/VERSION

@@ -0,0 +1 @@
+2.4.38-alpine

test/images/image-util.sh

@@ -89,16 +89,26 @@ getBaseImage() {
 # arm64, ppc64le, s390x
 build() {
   image=$1
+  img_folder=$1
   output_type=$2
   docker_version_check
 
-  if [[ -f ${image}/BASEIMAGE ]]; then
+  if [[ -f "${img_folder}/BASEIMAGE" ]]; then
     os_archs=$(listOsArchs "$image")
   else
     # prepend linux/ to the QEMUARCHS items.
     os_archs=$(printf 'linux/%s\n' "${!QEMUARCHS[*]}")
   fi
 
+  # image tag
+  TAG=$(<"${img_folder}/VERSION")
+
+  alias_name="$(cat "${img_folder}/ALIAS" 2>/dev/null || true)"
+  if [[ -n "${alias_name}" ]]; then
+    echo "Found an alias for '${image}'. Building / tagging image as '${alias_name}.'"
+    image="${alias_name}"
+  fi
+
   kube::util::ensure-gnu-sed
 
   for os_arch in ${os_archs}; do
@@ -116,15 +126,13 @@ build() {
     temp_dir=$(mktemp -d "${KUBE_ROOT}"/_tmp/test-images-build.XXXXXX)
     kube::util::trap_add "rm -rf ${temp_dir}" EXIT
 
-    cp -r "${image}"/* "${temp_dir}"
+    cp -r "${img_folder}"/* "${temp_dir}"
-    if [[ -f ${image}/Makefile ]]; then
+    if [[ -f ${img_folder}/Makefile ]]; then
       # make bin will take care of all the prerequisites needed
       # for building the docker image
-      make -C "${image}" bin OS="${os_name}" ARCH="${arch}" TARGET="${temp_dir}"
+      make -C "${img_folder}" bin OS="${os_name}" ARCH="${arch}" TARGET="${temp_dir}"
     fi
     pushd "${temp_dir}"
-    # image tag
-    TAG=$(<VERSION)
 
     if [[ -f BASEIMAGE ]]; then
       BASEIMAGE=$(getBaseImage "${os_arch}" | ${SED} "s|REGISTRY|${REGISTRY}|g")
@@ -190,6 +198,13 @@ push() {
     os_archs=$(printf 'linux/%s\n' "${!QEMUARCHS[*]}")
   fi
 
+  pushd "${image}"
+  alias_name="$(cat ALIAS 2>/dev/null || true)"
+  if [[ -n "${alias_name}" ]]; then
+    echo "Found an alias for '${image}'. Pushing image as '${alias_name}.'"
+    image="${alias_name}"
+  fi
+
   kube::util::ensure-gnu-sed
 
   # reset manifest list; needed in case multiple images are being built / pushed.
@@ -223,6 +238,7 @@ push() {
         "${HOME}/.docker/manifests/${manifest_image_folder}/${manifest_image_folder}-${suffix}"
     fi
   done
+  popd
   docker manifest push --purge "${REGISTRY}/${image}:${TAG}"
 }
 

test/images/nginx-new/ALIAS

@@ -0,0 +1 @@
+nginx

test/images/nginx-new/BASEIMAGE

@@ -0,0 +1,5 @@
+linux/amd64=nginx:1.15-alpine
+linux/arm=arm32v6/nginx:1.15-alpine
+linux/arm64=arm64v8/nginx:1.15-alpine
+linux/ppc64le=ppc64le/nginx:1.15-alpine
+linux/s390x=s390x/nginx:1.15-alpine

test/images/nginx-new/Dockerfile

@@ -0,0 +1,17 @@
+# Copyright 2020 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# NOTE(claudiub): Noop. We're just mirroring the image to staging.
+ARG BASEIMAGE
+FROM $BASEIMAGE

test/images/nginx-new/VERSION

@@ -0,0 +1 @@
+1.15-alpine

test/images/nginx/BASEIMAGE

@@ -0,0 +1,5 @@
+linux/amd64=nginx:1.14-alpine
+linux/arm=arm32v6/nginx:1.14-alpine
+linux/arm64=arm64v8/nginx:1.14-alpine
+linux/ppc64le=ppc64le/nginx:1.14-alpine
+linux/s390x=s390x/nginx:1.14-alpine

test/images/nginx/Dockerfile

@@ -0,0 +1,17 @@
+# Copyright 2020 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# NOTE(claudiub): Noop. We're just mirroring the image to staging.
+ARG BASEIMAGE
+FROM $BASEIMAGE

test/images/nginx/VERSION

@@ -0,0 +1 @@
+1.14-alpine

test/images/perl/BASEIMAGE

@@ -0,0 +1,5 @@
+linux/amd64=perl:5.26
+linux/arm=arm32v7/perl:5.26
+linux/arm64=arm64v8/perl:5.26
+linux/ppc64le=ppc64le/perl:5.26
+linux/s390x=s390x/perl:5.26

test/images/perl/Dockerfile

@@ -0,0 +1,17 @@
+# Copyright 2020 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# NOTE(claudiub): Noop. We're just mirroring the image to staging.
+ARG BASEIMAGE
+FROM $BASEIMAGE

test/images/perl/VERSION

@@ -0,0 +1 @@
+5.26