diff --git a/Makefile b/Makefile index 3060bb52..c36c0257 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 @@ -218,7 +218,7 @@ kind-load: check-cluster $(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