DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix re-adding stuff on rebase

Browse source 
Signed-off-by: Ricardo Lopes <ricardoapl.dev@gmail.com>
This commit is contained in:
Ricardo Lopes 2024-12-16 09:58:46 +00:00
parent 942aeefaa9
commit 9781d2b7f3
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/ci.yaml vendored
View file

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

1
.github/workflows/zz-tmpl-k8s-e2e.yaml vendored
View file

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

4
images/Makefile
View file

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