From 7eacb666f7941ae3f1084c5b01fc26811e715379 Mon Sep 17 00:00:00 2001
From: Sid Kattoju <83437591+skattoju@users.noreply.github.com>
Date: Tue, 2 May 2023 10:57:19 -0400
Subject: [PATCH] use hybrid controller instead of the pre-built version (#214)

---
 .../scaffolds/internal/templates/makefile.go  | 32 ++++++++++---------
 testdata/hybrid/memcached-operator/Makefile   | 32 ++++++++++---------
 2 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/pkg/plugins/hybrid/v1alpha/scaffolds/internal/templates/makefile.go b/pkg/plugins/hybrid/v1alpha/scaffolds/internal/templates/makefile.go
index b2c63199..c1b8d616 100644
--- a/pkg/plugins/hybrid/v1alpha/scaffolds/internal/templates/makefile.go
+++ b/pkg/plugins/hybrid/v1alpha/scaffolds/internal/templates/makefile.go
@@ -109,6 +109,23 @@ all: build
 help: ## Display this help.
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
 
+##@ Build
+.PHONY: build
+build: manifests generate fmt vet ## Build manager binary.
+	go build -o bin/manager main.go
+
+.PHONY: run
+run: manifests generate fmt vet ## Run against the configured Kubernetes cluster in ~/.kube/config
+	go run ./main.go
+
+.PHONY: docker-build
+docker-build: ## Build docker image with the manager.
+	docker build -t ${IMG} .
+
+.PHONY: docker-push
+docker-push: ## Push docker image with the manager.
+	docker push ${IMG}
+
 ##@ Development
 
 .PHONY: manifests
@@ -131,21 +148,6 @@ vet: ## Run go vet against code.
 test: manifests generate fmt vet envtest ## Run tests.
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./... -coverprofile cover.out
 
-
-##@ Build
-.PHONY: run
-run: manifests generate fmt vet ## Run against the configured Kubernetes cluster in ~/.kube/config
-	helm-operator
-	$(HELM_OPERATOR) run
-	
-.PHONY: docker-build
-docker-build: test ## Build docker image with the manager.
-	docker build -t ${IMG}
-
-.PHONY: docker-push
-docker-push: ## Push docker image with the manager.
-	docker push ${IMG}
-
 ##@ Deployment
 
 ifndef ignore-not-found
diff --git a/testdata/hybrid/memcached-operator/Makefile b/testdata/hybrid/memcached-operator/Makefile
index 6873bbf5..69ba5d39 100644
--- a/testdata/hybrid/memcached-operator/Makefile
+++ b/testdata/hybrid/memcached-operator/Makefile
@@ -36,6 +36,23 @@ all: build
 help: ## Display this help.
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
 
+##@ Build
+.PHONY: build
+build: manifests generate fmt vet ## Build manager binary.
+	go build -o bin/manager main.go
+
+.PHONY: run
+run: manifests generate fmt vet ## Run against the configured Kubernetes cluster in ~/.kube/config
+	go run ./main.go
+
+.PHONY: docker-build
+docker-build: ## Build docker image with the manager.
+	docker build -t ${IMG} .
+
+.PHONY: docker-push
+docker-push: ## Push docker image with the manager.
+	docker push ${IMG}
+
 ##@ Development
 
 .PHONY: manifests
@@ -58,21 +75,6 @@ vet: ## Run go vet against code.
 test: manifests generate fmt vet envtest ## Run tests.
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./... -coverprofile cover.out
 
-
-##@ Build
-.PHONY: run
-run: manifests generate fmt vet ## Run against the configured Kubernetes cluster in ~/.kube/config
-	helm-operator
-	$(HELM_OPERATOR) run
-	
-.PHONY: docker-build
-docker-build: test ## Build docker image with the manager.
-	docker build -t ${IMG}
-
-.PHONY: docker-push
-docker-push: ## Push docker image with the manager.
-	docker push ${IMG}
-
 ##@ Deployment
 
 ifndef ignore-not-found