Prepare switch to gcr.io

This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-07-08 17:56:50 -04:00
parent 6c72e42fb6
commit 86534b5124
8 changed files with 22 additions and 21 deletions

View file

@ -48,7 +48,7 @@ ifeq ($(ARCH),)
$(error mandatory variable ARCH is empty, either set it when calling the command or make sure 'go env GOARCH' works)
endif
REGISTRY ?= quay.io/kubernetes-ingress-controller
REGISTRY ?= gcr.io/k8s-staging-ingress-nginx
BASE_IMAGE ?= us.gcr.io/k8s-artifacts-prod/ingress-nginx/nginx:v20200708-g00f4a215d@sha256:b0727cebafc35f5ab50f3fa0be5fda7f79937f1683f525f40982e75b882195d8
@ -65,12 +65,12 @@ image: clean-image ## Build image for a particular arch.
--build-arg BASE_IMAGE="$(BASE_IMAGE)" \
--build-arg VERSION="$(TAG)" \
--build-arg TARGETARCH="$(ARCH)" \
-t $(REGISTRY)/nginx-ingress-controller:$(TAG) rootfs
-t $(REGISTRY)/controller:$(TAG) rootfs
.PHONY: clean-image
clean-image: ## Removes local image
echo "removing old image $(REGISTRY)/nginx-ingress-controller:$(TAG)"
@docker rmi -f $(REGISTRY)/nginx-ingress-controller:$(TAG) || true
echo "removing old image $(REGISTRY)/controller:$(TAG)"
@docker rmi -f $(REGISTRY)/controller:$(TAG) || true
.PHONY: build
build: ## Build ingress controller, debug tool and pre-stop hook.
@ -213,4 +213,4 @@ release: ensure-buildx clean
--platform $(subst $(SPACE),$(COMMA),$(PLATFORMS)) \
--build-arg BASE_IMAGE="$(BASE_IMAGE)" \
--build-arg VERSION="$(TAG)" \
-t $(REGISTRY)/nginx-ingress-controller:$(TAG) rootfs
-t $(REGISTRY)/controller:$(TAG) rootfs