@@ -29,9 +29,16 @@ var defaultGroupVersionsByFeatureGate = map[configv1.FeatureGateName][]groupVers
2929 {KubeVersionRange : semver .MustParseRange (">=1.34.0 <1.35.0" ), GroupVersion : schema.GroupVersion {Group : "admissionregistration.k8s.io" , Version : "v1beta1" }},
3030 },
3131 "DynamicResourceAllocation" : {
32- {KubeVersionRange : semver .MustParseRange ("< 1.31.0" ), GroupVersion : schema.GroupVersion {Group : "resource.k8s.io" , Version : "v1alpha2" }},
33- {KubeVersionRange : semver .MustParseRange (">= 1.31.0" ), GroupVersion : schema.GroupVersion {Group : "resource.k8s.io" , Version : "v1alpha3" }},
34- {KubeVersionRange : semver .MustParseRange (">= 1.32.0" ), GroupVersion : schema.GroupVersion {Group : "resource.k8s.io" , Version : "v1beta1" }},
32+ // We are promoting DRA to GA in OpenShift 4.21 (1.34), and the
33+ // alpha/beta apis will not be served starting with 4.21.
34+ // Set the max upper bound to '< 1.34.0' so these alpha/beta
35+ // apis are not enabled once the rebase PR lands and the
36+ // k8s version is updated to 1.34.x.
37+ // TODO: remove the enablement key for the alpha/beta enablement once
38+ // we remove the {Tech|Dev}Preview feature gate from openshift/api
39+ {KubeVersionRange : semver .MustParseRange ("< 1.34.0" ), GroupVersion : schema.GroupVersion {Group : "resource.k8s.io" , Version : "v1alpha3" }},
40+ {KubeVersionRange : semver .MustParseRange ("< 1.34.0" ), GroupVersion : schema.GroupVersion {Group : "resource.k8s.io" , Version : "v1beta1" }},
41+ {KubeVersionRange : semver .MustParseRange ("< 1.34.0" ), GroupVersion : schema.GroupVersion {Group : "resource.k8s.io" , Version : "v1beta2" }},
3542 },
3643 "VolumeAttributesClass" : {{GroupVersion : schema.GroupVersion {Group : "storage.k8s.io" , Version : "v1beta1" }}},
3744}
0 commit comments