diff --git a/openshift-hack/cmd/k8s-tests-ext/disabled_tests.go b/openshift-hack/cmd/k8s-tests-ext/disabled_tests.go index 32f2de55edd69..7670386daa70d 100644 --- a/openshift-hack/cmd/k8s-tests-ext/disabled_tests.go +++ b/openshift-hack/cmd/k8s-tests-ext/disabled_tests.go @@ -17,7 +17,7 @@ func filterOutDisabledSpecs(specs et.ExtensionTestSpecs) et.ExtensionTestSpecs { "[FeatureGate:SELinuxMount]", "[Feature:UserNamespacesPodSecurityStandards]", "[Feature:UserNamespacesSupport]", // disabled Beta - "[Feature:DynamicResourceAllocation]", + // "[Feature:DynamicResourceAllocation]", "[Feature:VolumeAttributesClass]", // disabled Beta "[sig-cli] Kubectl client Kubectl prune with applyset should apply and prune objects", // Alpha feature since k8s 1.27 // 4.19 diff --git a/openshift-hack/e2e/annotate/generated/zz_generated.annotations.go b/openshift-hack/e2e/annotate/generated/zz_generated.annotations.go index 9f0d8483bec0b..e9761895ed33c 100644 --- a/openshift-hack/e2e/annotate/generated/zz_generated.annotations.go +++ b/openshift-hack/e2e/annotate/generated/zz_generated.annotations.go @@ -247,7 +247,7 @@ var Annotations = map[string]string{ "[sig-api-machinery] ResourceQuota should be able to update and delete ResourceQuota. [Conformance]": " [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]", - "[sig-api-machinery] ResourceQuota should create a ResourceQuota and capture the life of a ResourceClaim [Feature:DynamicResourceAllocation]": " [Disabled:Alpha] [Suite:k8s]", + "[sig-api-machinery] ResourceQuota should create a ResourceQuota and capture the life of a ResourceClaim [Feature:DynamicResourceAllocation]": " [Suite:openshift/conformance/parallel] [Suite:k8s]", "[sig-api-machinery] ResourceQuota should create a ResourceQuota and capture the life of a configMap. [Conformance]": " [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]", @@ -1499,79 +1499,79 @@ var Annotations = map[string]string{ "[sig-node] Containers should use the image defaults if command and args are blank [NodeConformance] [Conformance]": " [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] ResourceSlice Controller creates slices": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] ResourceSlice Controller creates slices": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] cluster DaemonSet with admin access [Feature:DRAAdminAccess]": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] cluster DaemonSet with admin access [Feature:DRAAdminAccess]": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] cluster must apply per-node permission checks": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] cluster must apply per-node permission checks": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] cluster must manage ResourceSlices [Slow]": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] cluster must manage ResourceSlices [Slow]": " [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] cluster support validating admission policy for admin access [Feature:DRAAdminAccess]": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] cluster support validating admission policy for admin access [Feature:DRAAdminAccess]": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] cluster supports count/resourceclaims.resource.k8s.io ResourceQuota": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] cluster supports count/resourceclaims.resource.k8s.io ResourceQuota": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] cluster truncates the name of a generated resource claim": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] cluster truncates the name of a generated resource claim": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] kubelet must call NodePrepareResources even if not used by any container": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] kubelet must call NodePrepareResources even if not used by any container": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] kubelet must map configs and devices to the right containers": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] kubelet must map configs and devices to the right containers": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] kubelet must not run a pod if a claim is not ready": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] kubelet must not run a pod if a claim is not ready": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] kubelet must retry NodePrepareResources": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] kubelet must retry NodePrepareResources": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] kubelet must unprepare resources for force-deleted pod": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] kubelet must unprepare resources for force-deleted pod": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] kubelet registers plugin": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] kubelet registers plugin": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] multiple drivers using both drav1alpha4 and drapbv1beta1 work": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] multiple drivers using both drav1alpha4 and drapbv1beta1 work": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] multiple drivers using only drapbv1alpha4 work": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] multiple drivers using only drapbv1alpha4 work": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] multiple drivers using only drapbv1beta1 work": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] multiple drivers using only drapbv1beta1 work": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] on multiple nodes with different ResourceSlices keeps pod pending because of CEL runtime errors": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] on multiple nodes with different ResourceSlices keeps pod pending because of CEL runtime errors": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] on multiple nodes with network-attached resources supports sharing a claim sequentially [Slow]": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] on multiple nodes with network-attached resources supports sharing a claim sequentially [Slow]": " [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] on multiple nodes with node-local resources uses all resources": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] on multiple nodes with node-local resources uses all resources": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node deletes generated claims when pod is done": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node deletes generated claims when pod is done": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node does not delete generated claims when pod is restarting": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node does not delete generated claims when pod is restarting": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node must be possible for the driver to update the ResourceClaim.Status.Devices once allocated [Feature:DRAResourceClaimDeviceStatus]": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node must be possible for the driver to update the ResourceClaim.Status.Devices once allocated [Feature:DRAResourceClaimDeviceStatus]": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node must deallocate after use": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node must deallocate after use": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node removes reservation from claim when pod is done": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node removes reservation from claim when pod is done": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node retries pod scheduling after creating device class": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node retries pod scheduling after creating device class": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node retries pod scheduling after updating device class": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node retries pod scheduling after updating device class": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node runs a pod without a generated resource claim": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node runs a pod without a generated resource claim": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node supports claim and class parameters": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node supports claim and class parameters": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node supports external claim referenced by multiple containers of multiple pods": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node supports external claim referenced by multiple containers of multiple pods": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node supports external claim referenced by multiple pods": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node supports external claim referenced by multiple pods": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node supports init containers": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node supports init containers": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node supports inline claim referenced by multiple containers": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node supports inline claim referenced by multiple containers": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node supports reusing resources": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node supports reusing resources": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node supports sharing a claim concurrently": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node supports sharing a claim concurrently": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node supports simple pod referencing external resource claim": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node supports simple pod referencing external resource claim": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node supports simple pod referencing inline resource claim": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] on single node supports simple pod referencing inline resource claim": " [Suite:openshift/conformance/parallel] [Suite:k8s]", - "[sig-node] DRA [Feature:DynamicResourceAllocation] runs pod after driver starts": " [Disabled:Alpha] [Suite:k8s]", + "[sig-node] DRA [Feature:DynamicResourceAllocation] runs pod after driver starts": " [Suite:openshift/conformance/parallel] [Suite:k8s]", "[sig-node] Downward API [Serial] [Disruptive] [NodeFeature:DownwardAPIHugePages] Downward API tests for hugepages should provide container's limits.hugepages- and requests.hugepages- as env vars": " [Suite:k8s]", diff --git a/openshift-hack/e2e/annotate/rules.go b/openshift-hack/e2e/annotate/rules.go index d86747829417f..84553c369a115 100644 --- a/openshift-hack/e2e/annotate/rules.go +++ b/openshift-hack/e2e/annotate/rules.go @@ -17,8 +17,8 @@ var ( `\[FeatureGate:SELinuxMount\]`, `\[Feature:UserNamespacesPodSecurityStandards\]`, `\[Feature:UserNamespacesSupport\]`, // disabled Beta - `\[Feature:DynamicResourceAllocation\]`, - `\[Feature:VolumeAttributesClass\]`, // disabled Beta + // `\[Feature:DynamicResourceAllocation\]`, + `\[Feature:VolumeAttributesClass\]`, // disabled Beta `\[sig-cli\] Kubectl client Kubectl prune with applyset should apply and prune objects`, // Alpha feature since k8s 1.27 // 4.19 `\[Feature:PodLevelResources\]`, diff --git a/pkg/controlplane/instance.go b/pkg/controlplane/instance.go index 255157707e6f9..4814d6684cdc5 100644 --- a/pkg/controlplane/instance.go +++ b/pkg/controlplane/instance.go @@ -462,7 +462,7 @@ var ( flowcontrolv1beta2.SchemeGroupVersion, flowcontrolv1beta3.SchemeGroupVersion, networkingapiv1beta1.SchemeGroupVersion, - resourcev1beta1.SchemeGroupVersion, + // resourcev1beta1.SchemeGroupVersion, } // alphaAPIGroupVersionsDisabledByDefault holds the alpha APIs we have. They are always disabled by default. @@ -472,7 +472,7 @@ var ( authenticationv1alpha1.SchemeGroupVersion, apiserverinternalv1alpha1.SchemeGroupVersion, coordinationv1alpha2.SchemeGroupVersion, - resourcev1alpha3.SchemeGroupVersion, + // resourcev1alpha3.SchemeGroupVersion, certificatesv1alpha1.SchemeGroupVersion, networkingapiv1alpha1.SchemeGroupVersion, storageapiv1alpha1.SchemeGroupVersion, @@ -485,6 +485,7 @@ func DefaultAPIResourceConfigSource() *serverstorage.ResourceConfig { ret := serverstorage.NewResourceConfig() // NOTE: GroupVersions listed here will be enabled by default. Don't put alpha or beta versions in the list. ret.EnableVersions(stableAPIGroupVersionsEnabledByDefault...) + ret.EnableVersions(resourcev1alpha3.SchemeGroupVersion, resourcev1beta1.SchemeGroupVersion) // disable alpha and beta versions explicitly so we have a full list of what's possible to serve ret.DisableVersions(betaAPIGroupVersionsDisabledByDefault...) diff --git a/pkg/features/versioned_kube_features.go b/pkg/features/versioned_kube_features.go index 348c04df2ba0d..0bd51533f6e11 100644 --- a/pkg/features/versioned_kube_features.go +++ b/pkg/features/versioned_kube_features.go @@ -180,11 +180,11 @@ 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}, }, DRAResourceClaimDeviceStatus: { - {Version: version.MustParse("1.32"), Default: false, PreRelease: featuregate.Alpha}, + {Version: version.MustParse("1.32"), Default: true, PreRelease: featuregate.Alpha}, }, KubeletCrashLoopBackOffMax: { diff --git a/test/e2e/testing-manifests/dra/dra-test-driver-proxy.yaml b/test/e2e/testing-manifests/dra/dra-test-driver-proxy.yaml index 377bb2e587b34..a6cd052e3674f 100644 --- a/test/e2e/testing-manifests/dra/dra-test-driver-proxy.yaml +++ b/test/e2e/testing-manifests/dra/dra-test-driver-proxy.yaml @@ -47,7 +47,7 @@ spec: containers: - name: registrar - image: registry.k8s.io/sig-storage/hostpathplugin:v1.7.3 + image: registry.k8s.io/sig-storage/hostpathplugin:v1.15.0 args: - "--v=5" - "--endpoint=/plugins_registry/dra-test-driver-reg.sock" @@ -57,7 +57,7 @@ spec: name: registration-dir - name: plugin - image: registry.k8s.io/sig-storage/hostpathplugin:v1.7.3 + image: registry.k8s.io/sig-storage/hostpathplugin:v1.15.0 args: - "--v=5" - "--endpoint=/dra/dra-test-driver.sock"