[WIP] enable DRA by default in 4.20 #2471

tkashem · 2025-09-18T15:33:10Z

No description provided.

DRA e2e tests use the `hostpathplugin:v1.7.3` image https://github.com/kubernetes/kubernetes/blob/1b4c5b3f8605dc1c86050ae941a24556d4fbd678/test/e2e/testing-manifests/dra/dra-test-driver-proxy.yaml#L50 today the `appendCSIImageConfigs` function gathers CSI images from the `storage-csi` folder only, and the DRA tests use a separate version of the `hostpathplugin` than what is gathered from the `storage-csi` folder. As a consequence the generated image list does not include the version of the `hostpathplugin` image used by the DRA tests. This PR adds the `dra` folder to the CSI image gathering function. The output of the test: ``` go test -v -count=1 ./test/utils/image -run=TestCSIImageConfigs === RUN TestCSIImageConfigs csi_manifests_test.go:59: found image: registry: registry.k8s.io/sig-storage, name: csi-external-health-monitor-controller, version: v0.12.1 csi_manifests_test.go:59: found image: registry: registry.k8s.io/sig-storage, name: csi-attacher, version: v4.8.0 csi_manifests_test.go:59: found image: registry: registry.k8s.io/sig-storage, name: csi-provisioner, version: v5.1.0 csi_manifests_test.go:59: found image: registry: registry.k8s.io/sig-storage, name: csi-resizer, version: v1.13.1 csi_manifests_test.go:59: found image: registry: registry.k8s.io/sig-storage, name: csi-snapshotter, version: v8.2.0 csi_manifests_test.go:59: found image: registry: registry.k8s.io/cloud-provider-gcp, name: gcp-compute-persistent-disk-csi-driver, version: v1.4.0 csi_manifests_test.go:59: found image: registry: registry.k8s.io/sig-storage, name: volume-data-source-validator, version: v1.0.0 csi_manifests_test.go:59: found image: registry: registry.k8s.io/sig-storage, name: hostpathplugin, version: v1.16.1 csi_manifests_test.go:59: found image: registry: registry.k8s.io/sig-storage, name: csi-node-driver-registrar, version: v2.13.0 csi_manifests_test.go:59: found image: registry: registry.k8s.io/sig-storage, name: livenessprobe, version: v2.15.0 csi_manifests_test.go:59: found image: registry: registry.k8s.io/e2e-test-images, name: busybox, version: 1.36.1-1 csi_manifests_test.go:59: found image: registry: registry.k8s.io/sig-storage, name: hostpathplugin, version: v1.7.3 csi_manifests_test.go:59: found image: registry: registry.k8s.io/sig-storage, name: hello-populator, version: v1.0.1 --- PASS: TestCSIImageConfigs (0.01s) ```

this is an experiment, once we prove that it works when dra e2e tests pass and the openshift/api pr merges then we drop it

openshift-ci-robot · 2025-09-18T15:33:21Z

@tkashem: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

209d138|UPSTREAM: : force go mod to point to tkashem/api: does not specify an upstream backport in the commit message
6c78c7b|UPSTREAM: : enable the resource v1beta1 and v1beta2 apis: does not specify an upstream backport in the commit message
a8428b6|UPSTREAN: enable DRA e2e tests: does not specify an upstream backport in the commit message
c123b3e|UPSTREAM: 131698: add 'dra' folder to csi image config: the upstream PR kubernetes/kubernetes#131698 has not yet merged

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

tkashem · 2025-09-18T15:34:14Z

/payload-job-with-prs periodic-ci-openshift-release-master-ci-4.19-e2e-gcp-ovn openshift/api#2483

openshift-ci · 2025-09-18T15:34:24Z

@tkashem: it appears that you have attempted to use some version of the payload command, but your comment was incorrectly formatted and cannot be acted upon. See the docs for usage info.

tkashem · 2025-09-18T15:34:57Z

/payload-job-with-prs periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn openshift/api#2483

openshift-ci · 2025-09-18T15:35:00Z

@tkashem: it appears that you have attempted to use some version of the payload command, but your comment was incorrectly formatted and cannot be acted upon. See the docs for usage info.

openshift-ci · 2025-09-18T15:36:32Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tkashem

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~DOWNSTREAM_OWNERS~~ [tkashem]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

haircommander · 2025-09-18T15:42:37Z

pkg/features/kube_features.go


 	DynamicResourceAllocation: {
 		{Version: version.MustParse("1.26"), Default: false, PreRelease: featuregate.Alpha},
-		{Version: version.MustParse("1.32"), Default: false, PreRelease: featuregate.Beta},


I thought we didn't need this piece if we have the o/api pieces, because the cluster config operator will configure the feature gates enabled in the default set

haircommander · 2025-09-18T15:44:14Z

test/utils/image/csi_manifest.go

-	if err != nil {
-		panic(err)
+	for _, dir := range []string{"storage-csi", "dra"} {
+		err := fs.WalkDir(embeddedFS, dir, walkDirFn)


not using walkDirFn ?

haircommander · 2025-09-18T15:45:09Z

pkg/controlplane/instance.go

 		networkingapiv1beta1.SchemeGroupVersion,
-		resourcev1beta1.SchemeGroupVersion,
-		resourcev1beta2.SchemeGroupVersion,
+		// we enable DRA v1beta1 and v1beta2 APIs to achieve AI comformance


nit: conformance*

rphillips · 2025-09-18T16:41:07Z

/payload-job-with-prs periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn openshift/api#2483

openshift-ci · 2025-09-18T16:41:11Z

@rphillips: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/470510a0-94ae-11f0-9af7-661a632cc2e9-0

tkashem · 2025-09-18T22:58:54Z

/retest

today kas operator enables the resource v1beta1 and v1beta2 apis if it sees the DynamicResourceAllocation feature gate. but it seems, if we are to enable the apis and the feature then enabling it here seems safer

openshift-ci-robot · 2025-09-19T15:17:55Z

@tkashem: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

209d138|UPSTREAM: : force go mod to point to tkashem/api: does not specify an upstream backport in the commit message
a8428b6|UPSTREAN: enable DRA e2e tests: does not specify an upstream backport in the commit message
b77cff9|UPSTREAM: : enable the resource v1beta1 and v1beta2 apis: does not specify an upstream backport in the commit message
c123b3e|UPSTREAM: 131698: add 'dra' folder to csi image config: the upstream PR kubernetes/kubernetes#131698 has not yet merged

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

tkashem · 2025-09-19T17:16:49Z

/payload-job-with-prs periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn openshift/api#2483 openshift/origin#30283

openshift-ci · 2025-09-19T17:17:20Z

@tkashem: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/6e596100-957c-11f0-8018-e8d3abd6f90e-0

tkashem · 2025-09-19T17:26:02Z

/payload-job-with-prs periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn openshift/api#2483 openshift/origin#30283

openshift-ci · 2025-09-19T17:26:08Z

@tkashem: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/b7f40a80-957d-11f0-8cc1-ed039260cff2-0

openshift-ci-robot · 2025-09-19T21:16:16Z

@tkashem: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

209d138|UPSTREAM: : force go mod to point to tkashem/api: does not specify an upstream backport in the commit message
2a90fef|test: does not specify an upstream backport in the commit message
a8428b6|UPSTREAN: enable DRA e2e tests: does not specify an upstream backport in the commit message
b77cff9|UPSTREAM: : enable the resource v1beta1 and v1beta2 apis: does not specify an upstream backport in the commit message
c123b3e|UPSTREAM: 131698: add 'dra' folder to csi image config: the upstream PR kubernetes/kubernetes#131698 has not yet merged

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

tkashem · 2025-09-19T21:17:00Z

/payload-job-with-prs periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn openshift/api#2483 openshift/origin#30283

openshift-ci · 2025-09-19T21:17:04Z

@tkashem: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/fbab7f90-959d-11f0-8641-441a18ef305d-0

openshift-ci · 2025-09-20T02:57:36Z

@tkashem: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/k8s-e2e-gcp-ovn	`2a90fef`	link	true	`/test k8s-e2e-gcp-ovn`
ci/prow/integration	`2a90fef`	link	true	`/test integration`
ci/prow/e2e-aws-ovn-runc	`2a90fef`	link	true	`/test e2e-aws-ovn-runc`
ci/prow/e2e-aws-crun-wasm	`2a90fef`	link	true	`/test e2e-aws-crun-wasm`
ci/prow/e2e-aws-ovn-techpreview	`2a90fef`	link	false	`/test e2e-aws-ovn-techpreview`
ci/prow/e2e-metal-ipi-ovn-ipv6	`2a90fef`	link	true	`/test e2e-metal-ipi-ovn-ipv6`
ci/prow/verify	`2a90fef`	link	true	`/test verify`
ci/prow/e2e-aws-ovn-cgroupsv2	`2a90fef`	link	true	`/test e2e-aws-ovn-cgroupsv2`
ci/prow/unit	`2a90fef`	link	true	`/test unit`
ci/prow/e2e-aws-ovn-fips	`2a90fef`	link	true	`/test e2e-aws-ovn-fips`
ci/prow/e2e-aws-ovn-crun	`2a90fef`	link	true	`/test e2e-aws-ovn-crun`
ci/prow/e2e-gcp	`2a90fef`	link	true	`/test e2e-gcp`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

tkashem added 3 commits September 18, 2025 11:05

UPSTREAM: <drop>: force go mod to point to tkashem/api

209d138

this is an experiment, once we prove that it works when dra e2e tests pass and the openshift/api pr merges then we drop it

UPSTREAN: <carry> enable DRA e2e tests

a8428b6

openshift-ci-robot added the backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. label Sep 18, 2025

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 18, 2025

openshift-ci bot requested review from deads2k and p0lyn0mial September 18, 2025 15:36

openshift-ci bot added the vendor-update Touching vendor dir or related files label Sep 18, 2025

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 18, 2025

haircommander reviewed Sep 18, 2025

View reviewed changes

openshift-ci bot mentioned this pull request Sep 18, 2025

[WIP] promote DRA to the default feature set openshift/api#2483

Open

UPSTREAM: <carry>: enable the resource v1beta1 and v1beta2 apis

b77cff9

today kas operator enables the resource v1beta1 and v1beta2 apis if it sees the DynamicResourceAllocation feature gate. but it seems, if we are to enable the apis and the feature then enabling it here seems safer

tkashem force-pushed the dra-4.20 branch from 6c78c7b to b77cff9 Compare September 19, 2025 15:17

openshift-ci bot mentioned this pull request Sep 19, 2025

[WIP] allow upstream image hostpathplugin:v1.7.3 openshift/origin#30283

Open

test

2a90fef

[WIP] enable DRA by default in 4.20 #2471

Are you sure you want to change the base?

[WIP] enable DRA by default in 4.20 #2471

Uh oh!

Conversation

tkashem commented Sep 18, 2025

Uh oh!

openshift-ci-robot commented Sep 18, 2025

Uh oh!

tkashem commented Sep 18, 2025

Uh oh!

openshift-ci bot commented Sep 18, 2025

Uh oh!

tkashem commented Sep 18, 2025

Uh oh!

openshift-ci bot commented Sep 18, 2025

Uh oh!

openshift-ci bot commented Sep 18, 2025

Uh oh!

haircommander Sep 18, 2025

Choose a reason for hiding this comment

Uh oh!

haircommander Sep 18, 2025

Choose a reason for hiding this comment

Uh oh!

haircommander Sep 18, 2025

Choose a reason for hiding this comment

Uh oh!

rphillips commented Sep 18, 2025

Uh oh!

openshift-ci bot commented Sep 18, 2025

Uh oh!

tkashem commented Sep 18, 2025

Uh oh!

openshift-ci-robot commented Sep 19, 2025

Uh oh!

tkashem commented Sep 19, 2025

Uh oh!

openshift-ci bot commented Sep 19, 2025

Uh oh!

tkashem commented Sep 19, 2025

Uh oh!

openshift-ci bot commented Sep 19, 2025

Uh oh!

openshift-ci-robot commented Sep 19, 2025

Uh oh!

tkashem commented Sep 19, 2025

Uh oh!

openshift-ci bot commented Sep 19, 2025

Uh oh!

openshift-ci bot commented Sep 20, 2025

Uh oh!

Uh oh!