From 6489fe467c5f9c52ddeaede64d367ce5d77036fe Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Tue, 2 Jun 2026 13:11:52 +0200
Subject: [PATCH] DRA E2E: simplify kind.yaml

Runtime config can be set via the kind config, which is simpler than setting
the apiserver parameter.

DynamicResourceAllocation is enabled by default nowadays, but still needs to be
set for the current n-3 skew testing which picks 1.33 (1.37 still in alpha).
Similar for NodeLogQuery (GA in 1.36).
---
 test/e2e/dra/kind.yaml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/test/e2e/dra/kind.yaml b/test/e2e/dra/kind.yaml
index 9fb87542d03..a3688695c56 100644
--- a/test/e2e/dra/kind.yaml
+++ b/test/e2e/dra/kind.yaml
@@ -1,5 +1,10 @@
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
+runtimeConfig:
+  "resource.k8s.io/v1alpha3": "true"
+  "resource.k8s.io/v1beta1": "true"
+  "resource.k8s.io/v1beta2": "true"
+  "scheduling.k8s.io/v1alpha2": "true"
 containerdConfigPatches:
 # Enable CDI as described in
 # https://github.com/container-orchestrated-devices/container-device-interface#containerd-configuration
@@ -35,9 +40,6 @@ kubeadmConfigPatches:
             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,scheduling.k8s.io/v1alpha2=true"
   - |
     kind: InitConfiguration
     apiVersion: kubeadm.k8s.io/v1beta4
@@ -63,9 +65,6 @@ kubeadmConfigPatches:
         extraArgs:
           v: "5"
           vmodule: "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,scheduling.k8s.io/v1alpha2=true"
   - |
     kind: InitConfiguration
     apiVersion: kubeadm.k8s.io/v1beta3
@@ -82,5 +81,5 @@ kubeadmConfigPatches:
 #
 #    --config <(cat test/e2e/dra/kind.yaml; echo "  <some feature>: true")
 featureGates:
-  DynamicResourceAllocation: true
-  NodeLogQuery: true
+  DynamicResourceAllocation: true # Still needed for n-3 testing against kubelet 1.33. Can be removed once we only test against 1.34.
+  NodeLogQuery: true # Still needed for n-3/2/1 testing. Can be removed once we only test against >= 1.36.