Skip to content

Commit 7eacb66

Browse files
authored
use hybrid controller instead of the pre-built version (#214)
1 parent 4632388 commit 7eacb66

File tree

2 files changed

+34
-30
lines changed
  • pkg/plugins/hybrid/v1alpha/scaffolds/internal/templates
  • testdata/hybrid/memcached-operator

2 files changed

+34
-30
lines changed

pkg/plugins/hybrid/v1alpha/scaffolds/internal/templates/makefile.go

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,23 @@ all: build
109109
help: ## Display this help.
110110
@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)
111111
112+
##@ Build
113+
.PHONY: build
114+
build: manifests generate fmt vet ## Build manager binary.
115+
go build -o bin/manager main.go
116+
117+
.PHONY: run
118+
run: manifests generate fmt vet ## Run against the configured Kubernetes cluster in ~/.kube/config
119+
go run ./main.go
120+
121+
.PHONY: docker-build
122+
docker-build: ## Build docker image with the manager.
123+
docker build -t ${IMG} .
124+
125+
.PHONY: docker-push
126+
docker-push: ## Push docker image with the manager.
127+
docker push ${IMG}
128+
112129
##@ Development
113130
114131
.PHONY: manifests
@@ -131,21 +148,6 @@ vet: ## Run go vet against code.
131148
test: manifests generate fmt vet envtest ## Run tests.
132149
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./... -coverprofile cover.out
133150
134-
135-
##@ Build
136-
.PHONY: run
137-
run: manifests generate fmt vet ## Run against the configured Kubernetes cluster in ~/.kube/config
138-
helm-operator
139-
$(HELM_OPERATOR) run
140-
141-
.PHONY: docker-build
142-
docker-build: test ## Build docker image with the manager.
143-
docker build -t ${IMG}
144-
145-
.PHONY: docker-push
146-
docker-push: ## Push docker image with the manager.
147-
docker push ${IMG}
148-
149151
##@ Deployment
150152
151153
ifndef ignore-not-found

testdata/hybrid/memcached-operator/Makefile

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,23 @@ all: build
3636
help: ## Display this help.
3737
@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)
3838

39+
##@ Build
40+
.PHONY: build
41+
build: manifests generate fmt vet ## Build manager binary.
42+
go build -o bin/manager main.go
43+
44+
.PHONY: run
45+
run: manifests generate fmt vet ## Run against the configured Kubernetes cluster in ~/.kube/config
46+
go run ./main.go
47+
48+
.PHONY: docker-build
49+
docker-build: ## Build docker image with the manager.
50+
docker build -t ${IMG} .
51+
52+
.PHONY: docker-push
53+
docker-push: ## Push docker image with the manager.
54+
docker push ${IMG}
55+
3956
##@ Development
4057

4158
.PHONY: manifests
@@ -58,21 +75,6 @@ vet: ## Run go vet against code.
5875
test: manifests generate fmt vet envtest ## Run tests.
5976
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./... -coverprofile cover.out
6077

61-
62-
##@ Build
63-
.PHONY: run
64-
run: manifests generate fmt vet ## Run against the configured Kubernetes cluster in ~/.kube/config
65-
helm-operator
66-
$(HELM_OPERATOR) run
67-
68-
.PHONY: docker-build
69-
docker-build: test ## Build docker image with the manager.
70-
docker build -t ${IMG}
71-
72-
.PHONY: docker-push
73-
docker-push: ## Push docker image with the manager.
74-
docker push ${IMG}
75-
7678
##@ Deployment
7779

7880
ifndef ignore-not-found

0 commit comments

Comments
 (0)