Fix re-adding stuff on rebase

Signed-off-by: Ricardo Lopes <[email protected]>

.github/workflows/ci.yaml

@@ -194,7 +194,7 @@ jobs:
           make BASE_IMAGE=registry.k8s.io/ingress-nginx/nginx:${TAGNGINX} clean-image build image image-chroot
           make -C test/e2e-image image
           cd images/custom-error-pages/rootfs && docker image build \
-              --build-arg=BASE_IMAGE=registry.k8s.io/ingress-nginx/nginx-1.25:${TAGNGINX} \
+              --build-arg=BASE_IMAGE=registry.k8s.io/ingress-nginx/nginx:${TAGNGINX} \
               --build-arg GOLANG_VERSION=$(cat ../../../GOLANG_VERSION) \
               --tag ingress-controller/custom-error-pages:1.0.0-dev . \
               && cd ../../..

.github/workflows/zz-tmpl-k8s-e2e.yaml

@@ -44,7 +44,6 @@ jobs:
           SKIP_INGRESS_IMAGE_CREATION: true
           SKIP_E2E_IMAGE_CREATION: true
           SKIP_CUSTOMERRORPAGES_IMAGE_CREATION: true
-          ENABLE_VALIDATIONS: ${{ inputs.variation == 'VALIDATIONS' }}
           IS_CHROOT: ${{ inputs.variation == 'CHROOT' }}
         run: |
           kind get kubeconfig > $HOME/.kube/kind-config-kind

images/Makefile

@@ -41,9 +41,9 @@ EXTRAARGS ?= $(shell cat $(NAME)/EXTRAARGS)
 export DOCKER_CLI_EXPERIMENTAL=enabled
 
 # build with buildx
-BUILDX_PLATFORMS ?= linux/amd64,linux/arm,linux/arm64,linux/s390x
-OUTPUT ?=
-PROGRESS = plain
+PLATFORMS?=linux/amd64,linux/arm,linux/arm64
+OUTPUT?=
+PROGRESS=plain
 
 
 precheck:
@@ -58,7 +58,7 @@ build: precheck ensure-buildx
 		--label=org.opencontainers.image.description="Ingress NGINX $(NAME) image" \
 		--build-arg BASE_IMAGE=$(BASE_IMAGE) \
 		--build-arg GOLANG_VERSION=$(GO_VERSION) \
-		--platform=${BUILDX_PLATFORMS} $(OUTPUT) \
+		--platform=${PLATFORMS} $(OUTPUT) \
 		--progress=$(PROGRESS) \
 		--pull $(EXTRAARGS) \
 		-t $(IMAGE):$(TAG) $(NAME)/rootfs