Skip to content

Commit 411dac7

Browse files
committed
[experiment] enable dra
1 parent c9e894a commit 411dac7

File tree

8 files changed

+6928
-6927
lines changed

8 files changed

+6928
-6927
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func filterOutDisabledSpecs(specs et.ExtensionTestSpecs) et.ExtensionTestSpecs {
1717
"[FeatureGate:SELinuxMount]",
1818
"[Feature:UserNamespacesPodSecurityStandards]",
1919
"[Feature:UserNamespacesSupport]", // disabled Beta
20-
"[Feature:DynamicResourceAllocation]",
20+
// "[Feature:DynamicResourceAllocation]",
2121
"[Feature:VolumeAttributesClass]", // disabled Beta
2222
"[sig-cli] Kubectl client Kubectl prune with applyset should apply and prune objects", // Alpha feature since k8s 1.27
2323
// 4.19

openshift-hack/e2e/annotate/generated/zz_generated.annotations.go

+6,917-6,917
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

openshift-hack/e2e/annotate/rules.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ var (
1717
`\[FeatureGate:SELinuxMount\]`,
1818
`\[Feature:UserNamespacesPodSecurityStandards\]`,
1919
`\[Feature:UserNamespacesSupport\]`, // disabled Beta
20-
`\[Feature:DynamicResourceAllocation\]`,
21-
`\[Feature:VolumeAttributesClass\]`, // disabled Beta
20+
// `\[Feature:DynamicResourceAllocation\]`,
21+
`\[Feature:VolumeAttributesClass\]`, // disabled Beta
2222
`\[sig-cli\] Kubectl client Kubectl prune with applyset should apply and prune objects`, // Alpha feature since k8s 1.27
2323
// 4.19
2424
`\[Feature:PodLevelResources\]`,

pkg/controlplane/instance.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ var (
462462
flowcontrolv1beta2.SchemeGroupVersion,
463463
flowcontrolv1beta3.SchemeGroupVersion,
464464
networkingapiv1beta1.SchemeGroupVersion,
465-
resourcev1beta1.SchemeGroupVersion,
465+
// resourcev1beta1.SchemeGroupVersion,
466466
}
467467

468468
// alphaAPIGroupVersionsDisabledByDefault holds the alpha APIs we have. They are always disabled by default.
@@ -472,7 +472,7 @@ var (
472472
authenticationv1alpha1.SchemeGroupVersion,
473473
apiserverinternalv1alpha1.SchemeGroupVersion,
474474
coordinationv1alpha2.SchemeGroupVersion,
475-
resourcev1alpha3.SchemeGroupVersion,
475+
// resourcev1alpha3.SchemeGroupVersion,
476476
certificatesv1alpha1.SchemeGroupVersion,
477477
networkingapiv1alpha1.SchemeGroupVersion,
478478
storageapiv1alpha1.SchemeGroupVersion,
@@ -485,6 +485,7 @@ func DefaultAPIResourceConfigSource() *serverstorage.ResourceConfig {
485485
ret := serverstorage.NewResourceConfig()
486486
// NOTE: GroupVersions listed here will be enabled by default. Don't put alpha or beta versions in the list.
487487
ret.EnableVersions(stableAPIGroupVersionsEnabledByDefault...)
488+
ret.EnableVersions(resourcev1alpha3.SchemeGroupVersion, resourcev1beta1.SchemeGroupVersion)
488489

489490
// disable alpha and beta versions explicitly so we have a full list of what's possible to serve
490491
ret.DisableVersions(betaAPIGroupVersionsDisabledByDefault...)

pkg/features/versioned_kube_features.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,11 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
180180

181181
DynamicResourceAllocation: {
182182
{Version: version.MustParse("1.26"), Default: false, PreRelease: featuregate.Alpha},
183-
{Version: version.MustParse("1.32"), Default: false, PreRelease: featuregate.Beta},
183+
{Version: version.MustParse("1.32"), Default: true, PreRelease: featuregate.Beta},
184184
},
185185

186186
DRAResourceClaimDeviceStatus: {
187-
{Version: version.MustParse("1.32"), Default: false, PreRelease: featuregate.Alpha},
187+
{Version: version.MustParse("1.32"), Default: true, PreRelease: featuregate.Alpha},
188188
},
189189

190190
KubeletCrashLoopBackOffMax: {

test/e2e/dra/dra.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func perNode(maxAllocations int, nodes *Nodes) func() Resources {
7979
}
8080
}
8181

82-
var _ = framework.SIGDescribe("node")("DRA", feature.DynamicResourceAllocation, func() {
82+
var _ = framework.SIGDescribe("node")("DRA", feature.DynamicResourceAllocation, framework.WithSerial(), func() {
8383
f := framework.NewDefaultFramework("dra")
8484

8585
// The driver containers have to run with sufficient privileges to

test/e2e/testing-manifests/dra/dra-test-driver-proxy.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747

4848
containers:
4949
- name: registrar
50-
image: registry.k8s.io/sig-storage/hostpathplugin:v1.7.3
50+
image: registry.k8s.io/sig-storage/hostpathplugin:v1.15.0
5151
args:
5252
- "--v=5"
5353
- "--endpoint=/plugins_registry/dra-test-driver-reg.sock"

test/e2e_node/dra_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ const (
8383
retryTestTimeout = kubeletRetryPeriod + 30*time.Second
8484
)
8585

86-
var _ = framework.SIGDescribe("node")("DRA", feature.DynamicResourceAllocation, "[NodeAlphaFeature:DynamicResourceAllocation]", func() {
86+
var _ = framework.SIGDescribe("node")("DRA", feature.DynamicResourceAllocation, "[NodeAlphaFeature:DynamicResourceAllocation]", framework.WithSerial(), func() {
8787
f := framework.NewDefaultFramework("dra-node")
8888
f.NamespacePodSecurityLevel = admissionapi.LevelBaseline
8989

0 commit comments

Comments
 (0)