Update Makefile targets for consistency

Fixes #226

* Rename the `install` target to `kind-deploy`
* Remove the `generate` target from `kind-deplpoy`
* Create a new `install` target that installs CRD; corollary to `uninstall`
* Update help descriptions

Signed-off-by: Todd Short <[email protected]>

Author: tmshort

.github/workflows/deploy.yaml

@@ -0,0 +1,31 @@
+name: deplopy-test
+
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+    - main
+
+jobs:
+  unit-test-basic:
+    runs-on: ubuntu-latest
+    steps:
+
+    - uses: actions/checkout@v3
+
+    - uses: actions/setup-go@v4
+      with:
+        go-version-file: go.mod
+
+    - name: Run basic unit tests
+      run: |
+        make kind-cluster
+        make install
+        kubectl get crds operators.operators.operatorframework.io
+        make uninstall
+        ! kubectl get crds operators.operators.operatorframework.io
+        make deploy
+        kubectl get ns operator-controller-system
+        make undeploy
+        ! kubectl get ns operator-controller-system

Makefile

@@ -68,7 +68,7 @@ fmt: ## Run go fmt against code.
 vet: ## Run go vet against code.
 	go vet ./...
 
-.PHONY: test test-e2e e2e kind-load kind-cluster kind-cluster-cleanup
+.PHONY: test test-e2e e2e kind-load kind-cluster kind-cluster-cleanup kind-deploy
 test: manifests generate fmt vet test-unit e2e ## Run all tests.
 
 FOCUS := $(if $(TEST),-v -focus "$(TEST)")
@@ -84,13 +84,18 @@ test-unit: envtest ## Run the unit tests
 e2e: KIND_CLUSTER_NAME=operator-controller-e2e
 e2e: run test-e2e kind-cluster-cleanup ## Run e2e test suite on local kind cluster
 
-kind-load: kind ## Loads the currently constructed image onto the cluster
+kind-load: kind ## Loads the currently constructed image onto the kind cluster
 	$(KIND) load docker-image $(IMG) --name $(KIND_CLUSTER_NAME)
 
 kind-cluster: kind kind-cluster-cleanup ## Standup a kind cluster
 	$(KIND) create cluster --name ${KIND_CLUSTER_NAME}
 	$(KIND) export kubeconfig --name ${KIND_CLUSTER_NAME}
 
+kind-deploy: export MANIFEST="./operator-controller.yaml"
+kind-deploy: kind manifests kustomize ## Install controller and dependencies onto the kind cluster
+	kubectl kustomize config/default > operator-controller.yaml
+	envsubst '$$CATALOGD_VERSION,$$CERT_MGR_VERSION,$$RUKPAK_VERSION,$$MANIFEST' < scripts/install.tpl.sh | bash -s
+
 kind-cluster-cleanup: kind ## Delete the kind cluster
 	$(KIND) delete cluster --name ${KIND_CLUSTER_NAME}
 
@@ -110,7 +115,7 @@ build-linux: $(BUILDDEPS) ## Build manager binary using goreleaser for GOOS=linu
 	GOOS=linux $(BUILDCMD)
 
 .PHONY: run
-run: docker-build kind-cluster kind-load install ## Build the operator-controller then deploy it into a new kind cluster.
+run: docker-build kind-cluster kind-load kind-deploy ## Build the operator-controller then deploy it into a new kind cluster.
 
 .PHONY: wait
 wait:
@@ -133,21 +138,23 @@ release: goreleaser ## Runs goreleaser for the operator-controller. By default,
 	$(GORELEASER) $(GORELEASER_ARGS)
 
 quickstart: export MANIFEST="https://github.com/operator-framework/operator-controller/releases/download/$(VERSION)/operator-controller.yaml"
-quickstart: kustomize generate ## Generate the installation release manifests and scripts
+quickstart: kustomize ## Generate the installation release manifests and scripts with dependencies
 	kubectl kustomize config/default | sed "s/:devel/:$(VERSION)/g" > operator-controller.yaml
 	envsubst '$$CATALOGD_VERSION,$$CERT_MGR_VERSION,$$RUKPAK_VERSION,$$MANIFEST' < scripts/install.tpl.sh > install.sh
 
+##############
+# Deployment #
+##############
+
 ##@ Deployment
 
 ifndef ignore-not-found
   ignore-not-found = false
 endif
 
 .PHONY: install
-install: export MANIFEST="./operator-controller.yaml"
-install: manifests kustomize generate ## Install CRDs into the K8s cluster specified in ~/.kube/config.
-	kubectl kustomize config/default > operator-controller.yaml
-	envsubst '$$CATALOGD_VERSION,$$CERT_MGR_VERSION,$$RUKPAK_VERSION,$$MANIFEST' < scripts/install.tpl.sh | bash -s
+install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.
+	$(KUSTOMIZE) build config/crd | kubectl apply -f -
 
 .PHONY: uninstall
 uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
@@ -166,6 +173,8 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
 # Hack / Tools #
 ################
 
+##@ Tools
+
 ## Location to install dependencies to
 LOCALBIN ?= $(shell pwd)/hack/tools/bin
 $(LOCALBIN):