Skip to content

Commit 197c1bd

Browse files
authored
fix: Make dev cluster name configurable (#1051)
1 parent 4815395 commit 197c1bd

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ PULL_POLICY ?= IfNotPresent
196196

197197
# Development config
198198
RANCHER_HOSTNAME ?= my.hostname.dev
199+
CLUSTER_NAME ?= capi-test
199200

200201
CACHE_DIR ?= .buildx-cache/
201202
CACHE_COMMANDS = "--cache-from type=local,src=$(CACHE_DIR) --cache-to type=local,dest=$(CACHE_DIR),mode=max"
@@ -662,4 +663,4 @@ clean-release: ## Remove the release folder
662663

663664
.PHOHY: clean-dev-env
664665
clean-dev-env: ## Remove the dev env
665-
kind delete cluster --name=capi-test
666+
kind delete cluster --name=$(CLUSTER_NAME)

scripts/turtles-dev.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,26 @@ USE_TILT_DEV=${USE_TILT_DEV:-true}
2929

3030
BASEDIR=$(dirname "$0")
3131

32-
kind create cluster --config "$BASEDIR/kind-cluster-with-extramounts.yaml"
32+
kind create cluster --config "$BASEDIR/kind-cluster-with-extramounts.yaml" --name $CLUSTER_NAME
3333
docker pull $RANCHER_IMAGE
3434
kind load docker-image $RANCHER_IMAGE --name $CLUSTER_NAME
3535

3636
kubectl rollout status deployment coredns -n kube-system --timeout=90s
3737

38-
helm repo add rancher-latest https://releases.rancher.com/server-charts/latest
39-
helm repo add capi-operator https://kubernetes-sigs.github.io/cluster-api-operator
40-
helm repo add jetstack https://charts.jetstack.io
41-
helm repo add ngrok https://charts.ngrok.com
38+
helm repo add rancher-latest https://releases.rancher.com/server-charts/latest --force-update
39+
helm repo add capi-operator https://kubernetes-sigs.github.io/cluster-api-operator --force-update
40+
helm repo add jetstack https://charts.jetstack.io --force-update
41+
helm repo add ngrok https://charts.ngrok.com --force-update
4242
helm repo update
4343

4444
helm install cert-manager jetstack/cert-manager \
4545
--namespace cert-manager \
4646
--create-namespace \
4747
--set crds.enabled=true
4848

49-
helm upgrade ngrok ngrok/kubernetes-ingress-controller \
49+
helm upgrade ngrok ngrok/ngrok-operator \
50+
--namespace ngrok \
51+
--create-namespace \
5052
--install \
5153
--wait \
5254
--timeout 5m \

0 commit comments

Comments
 (0)