Skip to content

Commit 135a6f9

Browse files
authored
chore(Makefile): remove targets for kind clusters (cloudnative-pg#7186)
Now everything can be done directly through the `hack/setup.sh` script. Closes cloudnative-pg#7185 Signed-off-by: Gabriele Bartolini <gabriele.bartolini@enterprisedb.com>
1 parent efd28ad commit 135a6f9

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

Makefile

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,6 @@ manifests: controller-gen ## Generate manifests e.g. CRD, RBAC etc.
228228
generate: controller-gen ## Generate code.
229229
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
230230

231-
deploy-locally: kind-cluster ## Build and deploy operator in local cluster
232-
set -e ;\
233-
hack/setup-cluster.sh -n1 load deploy
234-
235231
olm-scorecard: operator-sdk ## Run the Scorecard test from operator-sdk
236232
$(OPERATOR_SDK) scorecard ${BUNDLE_IMG} --wait-time 60s --verbose
237233

@@ -350,14 +346,6 @@ GOBIN=$(PROJECT_DIR)/bin go install $(2) ;\
350346
}
351347
endef
352348

353-
kind-cluster: ## Create KinD cluster to run operator locally
354-
set -e ;\
355-
hack/setup-cluster.sh -n1 create
356-
357-
kind-cluster-destroy: ## Destroy KinD cluster created using kind-cluster command
358-
set -e ;\
359-
hack/setup-cluster.sh -n1 destroy
360-
361349
.PHONY: operator-sdk
362350
OPERATOR_SDK = $(LOCALBIN)/operator-sdk
363351
operator-sdk: ## Install the operator-sdk app

contribute/development_environment/README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,15 @@ build and deploy:
180180
```shell
181181
cd cloudnative-pg
182182
git checkout main
183-
make deploy-locally
183+
./hack/setup.sh create load deploy
184184
```
185185

186186
This will build the operator based on the `main` branch content, create a
187187
`kind` cluster in your workstation with a container registry that provides the
188188
operator image that you just built.
189189

190+
*Note:* For a list of options, run `./hack/setup-cluster.sh`.
191+
190192
> **NOTE:** In case of errors, make sure that you have the latest versions of the Go
191193
> binaries in your system. For this reason, from time to time, we recommend
192194
> you running: `make distclean`.
@@ -202,7 +204,7 @@ kubectl get deploy -n cnpg-system cnpg-controller-manager
202204
Now that your system has been validated, you can tear down the local cluster with:
203205

204206
```shell
205-
make kind-cluster-destroy
207+
./hack/setup.sh destroy
206208
```
207209

208210
Congratulations, you have a suitable development environment. You are now able

0 commit comments

Comments
 (0)