Skip to content

Commit 6c78c7b

Browse files
committed
UPSTREAM: <carry>: enable the resource v1beta1 and v1beta2 apis
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
1 parent a8428b6 commit 6c78c7b

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

pkg/controlplane/instance.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ import (
5151
policyapiv1 "k8s.io/api/policy/v1"
5252
rbacv1 "k8s.io/api/rbac/v1"
5353
resourcev1alpha3 "k8s.io/api/resource/v1alpha3"
54-
resourcev1beta1 "k8s.io/api/resource/v1beta1"
55-
resourcev1beta2 "k8s.io/api/resource/v1beta2"
5654
schedulingapiv1 "k8s.io/api/scheduling/v1"
5755
storageapiv1 "k8s.io/api/storage/v1"
5856
storageapiv1alpha1 "k8s.io/api/storage/v1alpha1"
@@ -464,8 +462,9 @@ var (
464462
flowcontrolv1beta2.SchemeGroupVersion,
465463
flowcontrolv1beta3.SchemeGroupVersion,
466464
networkingapiv1beta1.SchemeGroupVersion,
467-
resourcev1beta1.SchemeGroupVersion,
468-
resourcev1beta2.SchemeGroupVersion,
465+
// we enable DRA v1beta1 and v1beta2 APIs to achieve AI comformance
466+
// resourcev1beta1.SchemeGroupVersion,
467+
// resourcev1beta2.SchemeGroupVersion,
469468
}
470469

471470
// alphaAPIGroupVersionsDisabledByDefault holds the alpha APIs we have. They are always disabled by default.

pkg/features/kube_features.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
11641164

11651165
DynamicResourceAllocation: {
11661166
{Version: version.MustParse("1.26"), Default: false, PreRelease: featuregate.Alpha},
1167-
{Version: version.MustParse("1.32"), Default: false, PreRelease: featuregate.Beta},
1167+
{Version: version.MustParse("1.32"), Default: true, PreRelease: featuregate.Beta},
11681168
},
11691169

11701170
KubeletCrashLoopBackOffMax: {

0 commit comments

Comments
 (0)