Skip to content

Commit

Permalink
Merge pull request #1367 from salasberryfin/makefile-support-registry…
Browse files Browse the repository at this point in the history
…-override

chore: support registry and tag overrides in makefile
  • Loading branch information
k8s-ci-robot authored Nov 14, 2024
2 parents 3906bbe + 4148de1 commit ab66a2c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ CERT_MANAGER_VER := v1.14.4
# Define Docker related variables. Releases should modify and double check these vars.
export GCP_PROJECT ?= $(shell gcloud config get-value project)
REGISTRY ?= gcr.io/$(GCP_PROJECT)
STAGING_REGISTRY := gcr.io/k8s-staging-cluster-api-gcp
PROD_REGISTRY := registry.k8s.io/cluster-api-gcp
STAGING_REGISTRY ?= gcr.io/k8s-staging-cluster-api-gcp
PROD_REGISTRY ?= registry.k8s.io/cluster-api-gcp
IMAGE_NAME ?= cluster-api-gcp-controller
STAGING_BUCKET ?= k8s-staging-cluster-api-gcp
BUCKET ?= $(STAGING_BUCKET)
Expand Down Expand Up @@ -407,7 +407,7 @@ set-manifest-pull-policy:
## Release
## --------------------------------------

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

$(RELEASE_DIR):
Expand Down

0 comments on commit ab66a2c

Please sign in to comment.