Skip to content

Commit ab66a2c

Browse files
authored
Merge pull request #1367 from salasberryfin/makefile-support-registry-override
chore: support registry and tag overrides in makefile
2 parents 3906bbe + 4148de1 commit ab66a2c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ CERT_MANAGER_VER := v1.14.4
116116
# Define Docker related variables. Releases should modify and double check these vars.
117117
export GCP_PROJECT ?= $(shell gcloud config get-value project)
118118
REGISTRY ?= gcr.io/$(GCP_PROJECT)
119-
STAGING_REGISTRY := gcr.io/k8s-staging-cluster-api-gcp
120-
PROD_REGISTRY := registry.k8s.io/cluster-api-gcp
119+
STAGING_REGISTRY ?= gcr.io/k8s-staging-cluster-api-gcp
120+
PROD_REGISTRY ?= registry.k8s.io/cluster-api-gcp
121121
IMAGE_NAME ?= cluster-api-gcp-controller
122122
STAGING_BUCKET ?= k8s-staging-cluster-api-gcp
123123
BUCKET ?= $(STAGING_BUCKET)
@@ -407,7 +407,7 @@ set-manifest-pull-policy:
407407
## Release
408408
## --------------------------------------
409409

410-
RELEASE_TAG := $(shell git describe --abbrev=0 2>/dev/null)
410+
RELEASE_TAG ?= $(shell git describe --abbrev=0 2>/dev/null)
411411
RELEASE_DIR := out
412412

413413
$(RELEASE_DIR):

0 commit comments

Comments
 (0)