From e69472b9e9bbe65c9b8c7a704d56d22611d0d671 Mon Sep 17 00:00:00 2001 From: Cecile Robert-Michon Date: Wed, 18 Aug 2021 17:20:21 -0700 Subject: [PATCH] Cleanup Makefile and remove obsolete targets --- Makefile | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 77e6d3b60af..4167a60572a 100644 --- a/Makefile +++ b/Makefile @@ -101,7 +101,7 @@ KUBE_APISERVER=$(TOOLS_BIN_DIR)/kube-apiserver ETCD=$(TOOLS_BIN_DIR)/etcd # Define Docker related variables. Releases should modify and double check these vars. -REGISTRY ?= gcr.io/$(shell gcloud config get-value project) +REGISTRY ?= registry.local/fake STAGING_REGISTRY := gcr.io/k8s-staging-cluster-api-azure PROD_REGISTRY := us.gcr.io/k8s-artifacts-prod/cluster-api-azure IMAGE_NAME ?= cluster-api-azure-controller @@ -172,9 +172,9 @@ test-cover: envs-test $(KUBECTL) $(KUBE_APISERVER) $(ETCD) ## Run tests with cod test-e2e-run: generate-e2e-templates $(ENVSUBST) $(KUBECTL) $(GINKGO) ## Run e2e tests $(ENVSUBST) < $(E2E_CONF_FILE) > $(E2E_CONF_FILE_ENVSUBST) && \ $(GINKGO) -v -trace -tags=e2e -focus="$(GINKGO_FOCUS)" -skip="$(GINKGO_SKIP)" -nodes=$(GINKGO_NODES) --noColor=$(GINKGO_NOCOLOR) $(GINKGO_ARGS) ./test/e2e -- \ - -e2e.artifacts-folder="$(ARTIFACTS)" \ - -e2e.config="$(E2E_CONF_FILE_ENVSUBST)" \ - -e2e.skip-resource-cleanup=$(SKIP_CLEANUP) -e2e.use-existing-cluster=$(SKIP_CREATE_MGMT_CLUSTER) $(E2E_ARGS) + -e2e.artifacts-folder="$(ARTIFACTS)" \ + -e2e.config="$(E2E_CONF_FILE_ENVSUBST)" \ + -e2e.skip-resource-cleanup=$(SKIP_CLEANUP) -e2e.use-existing-cluster=$(SKIP_CREATE_MGMT_CLUSTER) $(E2E_ARGS) .PHONY: test-e2e test-e2e: ## Run e2e tests @@ -448,16 +448,6 @@ release-binary: $(RELEASE_DIR) go build -a -ldflags '$(LDFLAGS) -extldflags "-static"' \ -o $(RELEASE_DIR)/$(notdir $(RELEASE_BINARY))-$(GOOS)-$(GOARCH) $(RELEASE_BINARY) -.PHONY: release-staging -release-staging: ## Builds and push container images to the staging bucket. - REGISTRY=$(STAGING_REGISTRY) $(MAKE) docker-build-all docker-push-all release-alias-tag - -RELEASE_ALIAS_TAG=$(PULL_BASE_REF) - -.PHONY: release-alias-tag -release-alias-tag: # Adds the tag to the last build tag. - gcloud container images add-tag $(CONTROLLER_IMG):$(TAG) $(CONTROLLER_IMG):$(RELEASE_ALIAS_TAG) - .PHONY: release-notes release-notes: $(RELEASE_NOTES) $(RELEASE_NOTES)