Skip to content

Commit 9b53a7d

Browse files
Merge pull request #115 from razo7/fix-must-gather-repo-location-2
Removing must-gather image from makefile
2 parents d6a6341 + c90c9b1 commit 9b53a7d

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

Makefile

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ CATALOG_IMG ?= $(IMAGE_TAG_BASE)-catalog:$(IMAGE_TAG)
8989
# Image URL to use all building/pushing image targets
9090
IMG ?= $(IMAGE_TAG_BASE):$(IMAGE_TAG)
9191

92-
MUST_GATHER_IMAGE ?= node-maintenance-must-gather:$(IMAGE_TAG)
9392

9493
# BUNDLE_GEN_FLAGS are the flags passed to the operator-sdk generate bundle command
9594
BUNDLE_GEN_FLAGS ?= -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
@@ -246,14 +245,6 @@ docker-build: check ## Build docker image with the manager.
246245
docker-push: ## Push docker image with the manager.
247246
docker push ${IMG}
248247

249-
.PHONY: must-gather-build
250-
must-gather-build: ## Build must-gather image.
251-
docker build -t ${MUST_GATHER_IMAGE} ./must-gather
252-
253-
.PHONY: must-gather-push
254-
must-gather-push: ## Push must-gather image.
255-
docker push ${MUST_GATHER_IMAGE}
256-
257248
##@ Deployment
258249

259250
ifndef ignore-not-found
@@ -419,7 +410,7 @@ verify-unchanged: ## Verify there are no un-committed changes
419410
.PHONY: container-build
420411
container-build: check ## Build containers
421412
$(DOCKER_GO) "make bundle"
422-
make docker-build bundle-build must-gather-build
413+
make docker-build bundle-build
423414

424415
.PHONY: bundle-build-community
425416
bundle-build-community: bundle-community ## Run bundle community changes in CSV, and then build the bundle image.
@@ -428,13 +419,13 @@ bundle-build-community: bundle-community ## Run bundle community changes in CSV,
428419
.PHONY: container-build-community
429420
container-build-community: check ## Build containers for community
430421
$(DOCKER_GO) "make bundle-community"
431-
make docker-build bundle-build-community must-gather-build
422+
make docker-build bundle-build-community
432423

433424
.PHONY: container-push
434-
container-push: docker-push bundle-push catalog-build catalog-push must-gather-push ## Push containers (NOTE: catalog can't be build before bundle was pushed)
425+
container-push: docker-push bundle-push catalog-build catalog-push## Push containers (NOTE: catalog can't be build before bundle was pushed)
435426

436427
.PHONY: container-build-and-push-community
437-
container-build-and-push-community: container-build-community container-push ## Build four images, update CSV for community, and push all the images to Quay (docker, bundle, catalog, and must-gather).
428+
container-build-and-push-community: container-build-community container-push ## Build four images, update CSV for community, and push all the images to Quay (docker, bundle, and catalog).
438429
.PHONY: cluster-functest
439430
cluster-functest: ginkgo ## Run e2e tests in a real cluster
440431
./hack/functest.sh $(GINKGO_VERSION)

0 commit comments

Comments
 (0)