Images: Rework. (1/3) (#13014)

Co-authored-by: Marco Ebert <marco_ebert@icloud.com>

images/test-runner/Makefile

@@ -1,4 +1,4 @@
-# Copyright 2018 The Kubernetes Authors. All rights reserved.
+# Copyright 2025 The Kubernetes Authors. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,64 +12,28 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# set default shell
-SHELL=/bin/bash -o pipefail -o errexit
+BUILDER ?= ingress-nginx
+PLATFORMS ?= linux/amd64,linux/arm64
+REGISTRY ?= us-central1-docker.pkg.dev/k8s-staging-images/ingress-nginx
+IMAGE ?= $(REGISTRY)/e2e-test-runner
+TAG ?= $(shell cat TAG)
 
-DIR:=$(strip $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
-INIT_BUILDX=$(DIR)/../../hack/init-buildx.sh
+DIR = $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+BASE_IMAGE ?= $(shell cat $(DIR)/../../NGINX_BASE)
+GOLANG_VERSION ?= $(shell cat $(DIR)/../../GOLANG_VERSION)
 
-SHORT_SHA ?=$(shell git rev-parse --short HEAD)
-TAG ?=v$(shell date +%Y%m%d)-$(SHORT_SHA)
+.PHONY: builder
+builder:
+	docker buildx create --name $(BUILDER) --bootstrap || :
+	docker buildx inspect $(BUILDER)
 
-REGISTRY ?= local
-
-IMAGE = $(REGISTRY)/e2e-test-runner
-
-NGINX_BASE_IMAGE ?= $(shell cat $(DIR)/../../NGINX_BASE)
-
-# The env below is called GO_VERSION and not GOLANG_VERSION because 
-# the gcb image we use to build already defines GOLANG_VERSION and is a 
-# really old version
-GO_VERSION ?= $(shell cat $(DIR)/../../GOLANG_VERSION)
-
-# required to enable buildx
-export DOCKER_CLI_EXPERIMENTAL=enabled
-
-# build with buildx
-PLATFORMS?=linux/amd64,linux/arm64
-OUTPUT?=
-PROGRESS=plain
-
-image:
-	echo "Building docker image ($(ARCH))..."
-	docker build \
-		${PLATFORM_FLAG} ${PLATFORM} \
-		--no-cache \
-		--pull \
-		--push \
-		--build-arg BASE_IMAGE=${NGINX_BASE_IMAGE} \
-		--build-arg GOLANG_VERSION=${GO_VERSION} \
-		--build-arg ETCD_VERSION=3.5.13-0 \
-		--build-arg K8S_RELEASE=v1.32.2 \
-		--build-arg RESTY_CLI_VERSION=0.27 \
-		--build-arg RESTY_CLI_SHA=e5f4f3128af49ba5c4d039d0554e5ae91bbe05866f60eccfa96d3653274bff90 \
-		--build-arg LUAROCKS_VERSION=3.8.0 \
-		--build-arg LUAROCKS_SHA=ab6612ca9ab87c6984871d2712d05525775e8b50172701a0a1cabddf76de2be7 \
-		--build-arg CHART_TESTING_VERSION=3.8.0 \
-		--build-arg YAML_LINT_VERSION=1.33.0 \
-		--build-arg YAMALE_VERSION=4.0.4 \
-		--build-arg HELM_VERSION=3.14.4 \
-		--build-arg GINKGO_VERSION=2.23.0 \
-		--build-arg GOLINT_VERSION=latest \
-		-t ${IMAGE}:${TAG} rootfs
-
-build: ensure-buildx
+.PHONY: build
+build: builder
 	docker buildx build \
-		--platform=${PLATFORMS} ${OUTPUT} \
-		--progress=${PROGRESS} \
-		--pull \
-		--build-arg BASE_IMAGE=${NGINX_BASE_IMAGE} \
-		--build-arg GOLANG_VERSION=${GO_VERSION} \
+		--builder $(BUILDER) \
+		--platform $(PLATFORMS) \
+		--build-arg BASE_IMAGE=$(BASE_IMAGE) \
+		--build-arg GOLANG_VERSION=$(GOLANG_VERSION) \
 		--build-arg ETCD_VERSION=3.5.13-0 \
 		--build-arg K8S_RELEASE=v1.32.2 \
 		--build-arg RESTY_CLI_VERSION=0.27 \
@@ -82,20 +46,14 @@ build: ensure-buildx
 		--build-arg HELM_VERSION=3.14.4 \
 		--build-arg GINKGO_VERSION=2.23.0 \
 		--build-arg GOLINT_VERSION=latest \
-		-t ${IMAGE}:${TAG} rootfs
+		rootfs \
+		--tag $(IMAGE):$(TAG) \
+		$(OUTPUT)
 
-# push the cross built image
-push: OUTPUT=--push
+.PHONY: push
+push: OUTPUT = --push
 push: build
 
-# enable buildx
-ensure-buildx:
-# this is required for cloudbuild
-ifeq ("$(wildcard $(INIT_BUILDX))","")
-	@curl -sSL https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/hack/init-buildx.sh | bash
-else
-	@exec $(INIT_BUILDX)
-endif
-	@echo "done"
-
-.PHONY: build push ensure-buildx
+.PHONY: clean
+clean:
+	docker buildx rm $(BUILDER) || :

images/test-runner/cloudbuild.yaml

@@ -2,10 +2,8 @@ options:
   # Ignore Prow provided substitutions.
   substitution_option: ALLOW_LOOSE
 steps:
-  - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250116-2a05ea7e3d
-    env:
-      - REGISTRY=us-central1-docker.pkg.dev/k8s-staging-images/ingress-nginx
-    entrypoint: bash
-    args:
-      - -c
-      - gcloud auth configure-docker && cd images/test-runner && make push
+- name: gcr.io/cloud-builders/docker
+  dir: images/test-runner
+  entrypoint: make
+  args:
+  - push

images/test-runner/rootfs/Dockerfile

@@ -15,8 +15,8 @@ ARG BASE_IMAGE
 ARG GOLANG_VERSION
 ARG ETCD_VERSION
 
-FROM golang:${GOLANG_VERSION}-alpine3.21 as GO
-FROM registry.k8s.io/etcd:${ETCD_VERSION} as etcd
+FROM golang:${GOLANG_VERSION}-alpine3.21 AS go
+FROM registry.k8s.io/etcd:${ETCD_VERSION} AS etcd
 
 FROM ${BASE_IMAGE}
 
@@ -41,9 +41,9 @@ RUN set -eux; \
 		echo 'hosts: files dns' > /etc/nsswitch.conf; \
 	fi
 
-COPY --from=GO   /usr/local/go /usr/local/go
-ENV GOPATH /go
-ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
+COPY --from=go   /usr/local/go /usr/local/go
+ENV GOPATH=/go
+ENV PATH=$GOPATH/bin:/usr/local/go/bin:$PATH
 RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
 
 COPY --from=etcd /usr/local/bin/etcd /usr/local/bin/etcd