From d17ed9be174ef8a6f0971196530f785fd1ab759f Mon Sep 17 00:00:00 2001
From: Benjamin Elder <bentheelder@google.com>
Date: Fri, 31 Oct 2025 13:04:56 -0700
Subject: [PATCH] prepare DRA kind config for kubeadm v1beta4

---
 test/e2e/dra/kind.yaml | 58 +++++++++++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 17 deletions(-)

diff --git a/test/e2e/dra/kind.yaml b/test/e2e/dra/kind.yaml
index 8a4a731f087..e2536ad2d77 100644
--- a/test/e2e/dra/kind.yaml
+++ b/test/e2e/dra/kind.yaml
@@ -8,9 +8,48 @@ containerdConfigPatches:
     enable_cdi = true
 nodes:
 - role: control-plane
-  kubeadmConfigPatches:
+- role: worker
+- role: worker
+- role: worker
+kubeadmConfigPatches:
+  # v1beta4 for the future (v1.35.0+ ?)
+  # https://github.com/kubernetes-sigs/kind/issues/3847
+  # TODO: drop v1beta3 when kind makes the switch
   - |
     kind: ClusterConfiguration
+    apiVersion: kubeadm.k8s.io/v1beta4
+    scheduler:
+        extraArgs:
+          - name: "v"
+            value: "5"
+          - name: "vmodule"
+            value: "allocator=6,dynamicresources=6" # structured/allocator.go, DRA scheduler plugin
+    controllerManager:
+        extraArgs:
+          - name: "v"
+            value: "5"
+          - name: "vmodule"
+            value: "controller=6" # resourceclaim/controller.go - should have renamed it when copying the controller it was based on!
+    apiServer:
+        extraArgs:
+          runtime-config: "resource.k8s.io/v1alpha3=true,resource.k8s.io/v1beta1=true,resource.k8s.io/v1beta2=true"
+  - |
+    kind: InitConfiguration
+    apiVersion: kubeadm.k8s.io/v1beta4
+    nodeRegistration:
+      kubeletExtraArgs:
+        - name: "v"
+          value: "5"
+  - |
+    kind: JoinConfiguration
+    nodeRegistration:
+      kubeletExtraArgs:
+        - name: "v"
+          value: "5"
+  # v1beta3 for v1.23.0 ... ?
+  - |
+    kind: ClusterConfiguration
+    apiVersion: kubeadm.k8s.io/v1beta3
     scheduler:
         extraArgs:
           v: "5"
@@ -24,25 +63,10 @@ nodes:
           runtime-config: "resource.k8s.io/v1alpha3=true,resource.k8s.io/v1beta1=true,resource.k8s.io/v1beta2=true"
   - |
     kind: InitConfiguration
+    apiVersion: kubeadm.k8s.io/v1beta3
     nodeRegistration:
       kubeletExtraArgs:
         v: "5"
-- role: worker
-  kubeadmConfigPatches:
-  - |
-    kind: JoinConfiguration
-    nodeRegistration:
-      kubeletExtraArgs:
-        v: "5"
-- role: worker
-  kubeadmConfigPatches:
-  - |
-    kind: JoinConfiguration
-    nodeRegistration:
-      kubeletExtraArgs:
-        v: "5"
-- role: worker
-  kubeadmConfigPatches:
   - |
     kind: JoinConfiguration
     nodeRegistration: