[WIP] enable DRA by default in 4.20

go.mod

@@ -237,6 +237,8 @@ require (
 
 replace (
 	github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20250416174521-4eb003743b54
+
+	github.com/openshift/api => github.com/tkashem/api v0.0.0-20250918145552-86f718ce6bda
 	k8s.io/api => ./staging/src/k8s.io/api
 	k8s.io/apiextensions-apiserver => ./staging/src/k8s.io/apiextensions-apiserver
 	k8s.io/apimachinery => ./staging/src/k8s.io/apimachinery

openshift-hack/cmd/k8s-tests-ext/disabled_tests.go

@@ -11,7 +11,6 @@ func filterOutDisabledSpecs(specs et.ExtensionTestSpecs) et.ExtensionTestSpecs {
 		"Alpha": { // alpha features that are not gated
 			"[Feature:StorageVersionAPI]",
 			"[Feature:ClusterTrustBundle]",
-			"[Feature:DynamicResourceAllocation]",
 			"[sig-cli] Kubectl client Kubectl prune with applyset should apply and prune objects", // Alpha feature since k8s 1.27
 			// 4.19
 			"[Feature:PodLevelResources]",

pkg/controlplane/instance.go

@@ -464,8 +464,9 @@ var (
 		flowcontrolv1beta2.SchemeGroupVersion,
 		flowcontrolv1beta3.SchemeGroupVersion,
 		networkingapiv1beta1.SchemeGroupVersion,
-		resourcev1beta1.SchemeGroupVersion,
-		resourcev1beta2.SchemeGroupVersion,
+		// we enable DRA v1beta1 and v1beta2 APIs to achieve AI comformance
+		// resourcev1beta1.SchemeGroupVersion,
+		// resourcev1beta2.SchemeGroupVersion,
 	}
 
 	// alphaAPIGroupVersionsDisabledByDefault holds the alpha APIs we have.  They are always disabled by default.
@@ -489,6 +490,9 @@ func DefaultAPIResourceConfigSource() *serverstorage.ResourceConfig {
 	// NOTE: GroupVersions listed here will be enabled by default. Don't put alpha or beta versions in the list.
 	ret.EnableVersions(stableAPIGroupVersionsEnabledByDefault...)
 
+	// enable the v1beta1 and v1beta2 explicitly
+	ret.EnableVersions(resourcev1beta1.SchemeGroupVersion, resourcev1beta2.SchemeGroupVersion)
+
 	// disable alpha and beta versions explicitly so we have a full list of what's possible to serve
 	ret.DisableVersions(betaAPIGroupVersionsDisabledByDefault...)
 	ret.DisableVersions(alphaAPIGroupVersionsDisabledByDefault...)

pkg/features/kube_features.go

@@ -1164,7 +1164,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
 
 	DynamicResourceAllocation: {
 		{Version: version.MustParse("1.26"), Default: false, PreRelease: featuregate.Alpha},
-		{Version: version.MustParse("1.32"), Default: false, PreRelease: featuregate.Beta},
+		{Version: version.MustParse("1.32"), Default: true, PreRelease: featuregate.Beta},
 	},
 
 	KubeletCrashLoopBackOffMax: {

test/utils/image/csi_manifest.go

@@ -44,7 +44,7 @@ func appendCSIImageConfigs(configs map[ImageID]Config) {
 		}
 	}
 
-	err := fs.WalkDir(embeddedFS, "storage-csi", func(path string, d fs.DirEntry, err error) error {
+	walkDirFn := func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
 			return err
 		}
@@ -97,10 +97,13 @@ func appendCSIImageConfigs(configs map[ImageID]Config) {
 
 		}
 		return nil
+	}
 
-	})
-	if err != nil {
-		panic(err)
+	for _, dir := range []string{"storage-csi"} {
+		err := fs.WalkDir(embeddedFS, dir, walkDirFn)
+		if err != nil {
+			panic(fmt.Errorf("error while extracting CSI image configs from directory: %q - %w", dir, err))
+		}
 	}
 }
 

test/utils/image/csi_manifests_test.go

@@ -56,6 +56,7 @@ func TestCSIImageConfigs(t *testing.T) {
 	}
 	actualImages := sets.NewString()
 	for _, config := range configs {
+		t.Logf("found image: %s", config)
 		assert.NotEmpty(t, config.registry, "registry")
 		assert.NotEmpty(t, config.name, "name")
 		assert.NotEmpty(t, config.version, "version")

test/utils/image/manifest.go

@@ -52,6 +52,10 @@ type Config struct {
 	version  string
 }
 
+func (i Config) String() string {
+	return fmt.Sprintf("registry: %s, name: %s, version: %s", i.registry, i.name, i.version)
+}
+
 // SetRegistry sets an image registry in a Config struct
 func (i *Config) SetRegistry(registry string) {
 	i.registry = registry