diff --git a/Makefile b/Makefile index a2573b3e1..c438199d4 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ CONTAINER_RUNTIME := docker else ifneq (, $(shell command -v podman 2>/dev/null)) CONTAINER_RUNTIME := podman else -$(warning Could not find docker or podman in path! This may result in targets requiring a container runtime failing!) +$(warning Could not find docker or podman in path! This may result in targets requiring a container runtime failing!) endif KUSTOMIZE_BUILD_DIR := config/overlays/tls @@ -180,8 +180,7 @@ kind-redeploy: generate docker-build kind-load kind-deploy #EXHELP Redeploy newl .PHONY: kind-cluster kind-cluster: $(KIND) #EXHELP Standup a kind cluster. -$(KIND) delete cluster --name $(KIND_CLUSTER_NAME) - # kind-config.yaml can be deleted after upgrading to Kubernetes 1.30 - $(KIND) create cluster --name $(KIND_CLUSTER_NAME) --image $(KIND_CLUSTER_IMAGE) --config ./kind-config.yaml + $(KIND) create cluster --name $(KIND_CLUSTER_NAME) --image $(KIND_CLUSTER_IMAGE) $(KIND) export kubeconfig --name $(KIND_CLUSTER_NAME) .PHONY: kind-clean diff --git a/dev/podman/kind-with-registry-podman.sh b/dev/podman/kind-with-registry-podman.sh index a3ba77658..c638caeaa 100755 --- a/dev/podman/kind-with-registry-podman.sh +++ b/dev/podman/kind-with-registry-podman.sh @@ -22,10 +22,6 @@ fi cat <