Merge pull request #27 from vshn/add/devcontainers

Small adjustments to make devcontainers play nice
vshn · Jan 6, 2025 · 1300332 · 1300332
2 parents 862548c + 919c605
commit 1300332
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -180,7 +180,7 @@ csi-install:
 
 .PHONY: clean
 clean: kind-clean ## Clean up local dev environment
-	rm $(vcluster_bin)
+	rm -f $(vcluster_bin)
 
 metallb-setup: $(metallb_sentinel) ## Install metallb as loadbalancer
 

diff --git a/kind/kind.mk b/kind/kind.mk
@@ -36,6 +36,7 @@ kind-load-image: kind-setup build-docker ## Load the container image onto kind c
 
 .PHONY: kind-clean
 kind-clean: export KUBECONFIG = $(KIND_KUBECONFIG)
+kind-clean: $(kind_bin)
 kind-clean: ## Removes the kind Cluster
 	@$(kind_bin) delete cluster --name $(KIND_CLUSTER) || true
 	rm -rf $(kind_dir) $(kind_bin)
@@ -46,7 +47,7 @@ $(KIND_KUBECONFIG): $(kind_bin)
 		--name $(KIND_CLUSTER) \
 		--image $(KIND_IMAGE) \
 		--config kind/config.yaml
-	ln -s $(KIND_KUBECONFIG) $(kind_dir)/kind-config
+	cp $(KIND_KUBECONFIG) $(kind_dir)/kind-config
 	@kubectl version
 	@kubectl cluster-info
 	@kubectl config use-context kind-$(KIND_CLUSTER)