Skip to content

Commit fc59d5c

Browse files
committed
temporarily enable v1beta2
1 parent aaf8f8b commit fc59d5c

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

pkg/operator/configobservation/apienablement/observe_runtime_config.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,14 @@ 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+
// when DRA goes GA with OpenShift 4.21 (1.34), alpha and beta
33+
// apis must not be served. But for now, while 1.34 rebase is
34+
// in progress, continue serving these apis.
35+
// TODO: remove the following alpha/beta enablement for resource
36+
// apis after the 1.34 rebase PR has successfully merges.
37+
{KubeVersionRange: semver.MustParseRange(">=1.31.0 <1.35.0"), GroupVersion: schema.GroupVersion{Group: "resource.k8s.io", Version: "v1alpha3"}},
38+
{KubeVersionRange: semver.MustParseRange(">=1.32.0 <1.35.0"), GroupVersion: schema.GroupVersion{Group: "resource.k8s.io", Version: "v1beta1"}},
39+
{KubeVersionRange: semver.MustParseRange(">=1.33.0 <1.35.0"), GroupVersion: schema.GroupVersion{Group: "resource.k8s.io", Version: "v1beta2"}},
3540
},
3641
"VolumeAttributesClass": {{GroupVersion: schema.GroupVersion{Group: "storage.k8s.io", Version: "v1beta1"}}},
3742
}

0 commit comments

Comments
 (0)