File tree Expand file tree Collapse file tree 1 file changed +9
-4
lines changed Expand file tree Collapse file tree 1 file changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -147,10 +147,15 @@ SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest
147147KUBEBUILDER_ASSETS ?= $(shell $(SETUP_ENVTEST ) use --use-env -p path $(KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ) )
148148
149149# Define Docker related variables. Releases should modify and double check these vars.
150- ifeq (,$(shell command -v gcloud) )
151- REGISTRY ?= gcr.io/$(shell gcloud config get-value project)
152- else
153- REGISTRY ?= localhost:5000
150+ ifneq (,$(shell command -v gcloud) )
151+ ifneq (,$(shell gcloud config get-value project))
152+ REGISTRY ?= gcr.io/$(shell gcloud config get-value project)
153+ endif
154+ endif
155+
156+ # If REGISTRY is not set, default to localhost:5000 to use the kind registry.
157+ ifndef REGISTRY
158+ REGISTRY ?= localhost:5000
154159endif
155160STAGING_REGISTRY := gcr.io/k8s-staging-cluster-api-azure
156161PROD_REGISTRY := registry.k8s.io/cluster-api-azure
You can’t perform that action at this time.
0 commit comments