From 8758cc82002e019af285a302d6dc89fdeb4d41df Mon Sep 17 00:00:00 2001
From: Mikalai Radchuk <mradchuk@redhat.com>
Date: Fri, 14 Jun 2024 15:49:56 +0200
Subject: [PATCH] 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 <mradchuk@redhat.com>
---
 Makefile                                | 5 ++---
 dev/podman/kind-with-registry-podman.sh | 4 ----
 kind-config.yaml                        | 8 --------
 3 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 kind-config.yaml

diff --git a/Makefile b/Makefile
index a2573b3e11..c438199d41 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 a3ba77658b..c638caeaac 100755
--- a/dev/podman/kind-with-registry-podman.sh
+++ b/dev/podman/kind-with-registry-podman.sh
@@ -22,10 +22,6 @@ fi
 cat <<EOF | kind create cluster --config=-
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
-featureGates:
-  "ValidatingAdmissionPolicy": true
-runtimeConfig:
-  "admissionregistration.k8s.io/v1beta1": true
 containerdConfigPatches:
 - |-
   [plugins."io.containerd.grpc.v1.cri".registry]
diff --git a/kind-config.yaml b/kind-config.yaml
deleted file mode 100644
index 40b75f935e..0000000000
--- a/kind-config.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Can be deleted after upgrading to Kubernetes 1.30
-kind: Cluster
-apiVersion: kind.x-k8s.io/v1alpha4
-featureGates:
-  ValidatingAdmissionPolicy: true
-runtimeConfig:
-  admissionregistration.k8s.io/v1beta1: true
-