Skip to content

Commit 8758cc8

Browse files
author
Mikalai Radchuk
committed
Remove kind config
We no longer need to enable `ValidatingAdmissionPolicy` since it is enabled by default in K8s 1.30. This means we can delete `kind-config.yaml`. Signed-off-by: Mikalai Radchuk <[email protected]>
1 parent edc91ad commit 8758cc8

File tree

3 files changed

+2
-15
lines changed

3 files changed

+2
-15
lines changed

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ CONTAINER_RUNTIME := docker
5151
else ifneq (, $(shell command -v podman 2>/dev/null))
5252
CONTAINER_RUNTIME := podman
5353
else
54-
$(warning Could not find docker or podman in path! This may result in targets requiring a container runtime failing!)
54+
$(warning Could not find docker or podman in path! This may result in targets requiring a container runtime failing!)
5555
endif
5656

5757
KUSTOMIZE_BUILD_DIR := config/overlays/tls
@@ -180,8 +180,7 @@ kind-redeploy: generate docker-build kind-load kind-deploy #EXHELP Redeploy newl
180180
.PHONY: kind-cluster
181181
kind-cluster: $(KIND) #EXHELP Standup a kind cluster.
182182
-$(KIND) delete cluster --name $(KIND_CLUSTER_NAME)
183-
# kind-config.yaml can be deleted after upgrading to Kubernetes 1.30
184-
$(KIND) create cluster --name $(KIND_CLUSTER_NAME) --image $(KIND_CLUSTER_IMAGE) --config ./kind-config.yaml
183+
$(KIND) create cluster --name $(KIND_CLUSTER_NAME) --image $(KIND_CLUSTER_IMAGE)
185184
$(KIND) export kubeconfig --name $(KIND_CLUSTER_NAME)
186185

187186
.PHONY: kind-clean

dev/podman/kind-with-registry-podman.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ fi
2222
cat <<EOF | kind create cluster --config=-
2323
kind: Cluster
2424
apiVersion: kind.x-k8s.io/v1alpha4
25-
featureGates:
26-
"ValidatingAdmissionPolicy": true
27-
runtimeConfig:
28-
"admissionregistration.k8s.io/v1beta1": true
2925
containerdConfigPatches:
3026
- |-
3127
[plugins."io.containerd.grpc.v1.cri".registry]

kind-config.yaml

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)