From 2b87a1d46f5c97b3ca65febcbf707ab4dc15e1ad Mon Sep 17 00:00:00 2001
From: Camila Macedo <7708031+camilamacedo86@users.noreply.github.com>
Date: Mon, 18 Nov 2024 08:19:12 +0000
Subject: [PATCH] =?UTF-8?q?Revert=20"=F0=9F=90=9B=20Check=20cluster=20is?=
 =?UTF-8?q?=20running=20for=20non-standalone=20Make=20targets=20(#437)"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b30eb4acdac6198bcf48f1a0d61251a6e1e741da.
---
 Makefile | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 3060bb52..22104944 100644
--- a/Makefile
+++ b/Makefile
@@ -102,7 +102,7 @@ FOCUS := $(if $(TEST),-v -focus "$(TEST)")
 ifeq ($(origin E2E_FLAGS), undefined)
 E2E_FLAGS :=
 endif
-test-e2e: check-cluster $(GINKGO) ## Run the e2e tests on existing cluster
+test-e2e: $(GINKGO) ## Run the e2e tests
 	$(GINKGO) $(E2E_FLAGS) -trace -vv $(FOCUS) test/e2e
 
 e2e: KIND_CLUSTER_NAME := catalogd-e2e
@@ -214,11 +214,11 @@ kind-cluster-cleanup: $(KIND) ## Delete the kind cluster
 	$(KIND) delete cluster --name $(KIND_CLUSTER_NAME)
 
 .PHONY: kind-load
-kind-load: check-cluster $(KIND) ## Load the built images onto the local cluster
+kind-load: $(KIND) ## Load the built images onto the local cluster
 	docker save $(IMAGE) | $(KIND) load image-archive /dev/stdin --name $(KIND_CLUSTER_NAME)
 
 .PHONY: install
-install: check-cluster build-container kind-load deploy wait ## Install local catalogd to an existing cluster
+install: build-container kind-load deploy wait ## Install local catalogd
 
 .PHONY: deploy
 deploy: export MANIFEST="./catalogd.yaml"
@@ -228,7 +228,7 @@ deploy: $(KUSTOMIZE) ## Deploy Catalogd to the K8s cluster specified in ~/.kube/
 	$(KUSTOMIZE) build $(KUSTOMIZE_OVERLAY) | sed "s/cert-git-version/cert-$(GIT_VERSION)/g" > catalogd.yaml
 	envsubst '$$CERT_MGR_VERSION,$$MANIFEST,$$DEFAULT_CATALOGS' < scripts/install.tpl.sh | bash -s
 
-.PHONY: check-cluster only-deploy-manifest
+.PHONY: only-deploy-manifest
 only-deploy-manifest: $(KUSTOMIZE) ## Deploy just the Catalogd manifest--used in e2e testing where cert-manager is installed in a separate step
 	cd config/base/manager && $(KUSTOMIZE) edit set image controller=$(IMAGE)
 	$(KUSTOMIZE) build $(KUSTOMIZE_OVERLAY) | kubectl apply -f -
@@ -266,10 +266,3 @@ quickstart: $(KUSTOMIZE) generate ## Generate the installation release manifests
 .PHONY: demo-update
 demo-update:
 	hack/scripts/generate-asciidemo.sh
-
-.PHONY: check-cluster
-check-cluster:
-	if ! kubectl config current-context >/dev/null 2>&1; then \
-		echo "Error: Could not get current Kubernetes context. Maybe use 'run' or 'e2e' targets first?"; \
-		exit 1; \
-	fi