Merge pull request #903 from mhutter/fix/makefile-help

Ignore commented-out targets in `make help`

Makefile

@@ -10,7 +10,7 @@ MAKEFLAGS += --no-builtin-variables
 
 .PHONY: help
 help: ## Show this help
-	@grep -E -h '\s##\s' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
+	@grep -E -h '^[^#].+\s##\s' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
 
 # extensible array of targets. Modules can add target to this variable for the all-in-one target.
 clean_targets := build-clean

envtest/integration.mk

@@ -32,13 +32,6 @@ integration-test: $(setup_envtest_bin) generate restic-integration-test-setup .e
 	export KUBEBUILDER_ASSETS="$$($(setup_envtest_bin) $(ENVTEST_ADDITIONAL_FLAGS) use -i -p path '$(ENVTEST_K8S_VERSION)!')" && \
 	go test -tags=integration -coverprofile cover.out -covermode atomic ./...
 
-# .PHONY: integration-test
-# integration-test: $(setup_envtest_bin) .envtest_crds ## Run integration tests against code
-# 	$(setup_envtest_bin) $(ENVTEST_ADDITIONAL_FLAGS) use '$(ENVTEST_K8S_VERSION)!'
-# 	@chmod -R +w $(go_bin)/k8s
-# 	export KUBEBUILDER_ASSETS="$$($(setup_envtest_bin) $(ENVTEST_ADDITIONAL_FLAGS) use -i -p path '$(ENVTEST_K8S_VERSION)!')" && \
-# 	go test -tags=integration -coverprofile cover.out -covermode atomic ./...
-
 $(envtest_crd_dir):
 	@mkdir -p $@