Skip to content

Commit 33ea278

Browse files
pohlypohly
committed
DRA: use v1beta1 API
No code is left which depends on the v1alpha3, except of course the code implementing that version.
1 parent 81fd642 commit 33ea278

File tree

48 files changed

+306
-270
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+306
-270
lines changed

‎cmd/kube-controller-manager/app/core.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,8 +411,8 @@ func startResourceClaimController(ctx context.Context, controllerContext Control
411411
utilfeature.DefaultFeatureGate.Enabled(features.DRAAdminAccess),
412412
controllerContext.ClientBuilder.ClientOrDie("resource-claim-controller"),
413413
controllerContext.InformerFactory.Core().V1().Pods(),
414-
controllerContext.InformerFactory.Resource().V1alpha3().ResourceClaims(),
415-
controllerContext.InformerFactory.Resource().V1alpha3().ResourceClaimTemplates())
414+
controllerContext.InformerFactory.Resource().V1beta1().ResourceClaims(),
415+
controllerContext.InformerFactory.Resource().V1beta1().ResourceClaimTemplates())
416416
if err != nil {
417417
return nil, true, fmt.Errorf("failed to start resource claim controller: %v", err)
418418
}

‎pkg/controller/resourceclaim/controller.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@ import (
2525
"time"
2626

2727
v1 "k8s.io/api/core/v1"
28-
resourceapi "k8s.io/api/resource/v1alpha3"
28+
resourceapi "k8s.io/api/resource/v1beta1"
2929
apierrors "k8s.io/apimachinery/pkg/api/errors"
3030
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3131
"k8s.io/apimachinery/pkg/types"
3232
"k8s.io/apimachinery/pkg/util/runtime"
3333
"k8s.io/apimachinery/pkg/util/wait"
3434
corev1apply "k8s.io/client-go/applyconfigurations/core/v1"
3535
v1informers "k8s.io/client-go/informers/core/v1"
36-
resourceinformers "k8s.io/client-go/informers/resource/v1alpha3"
36+
resourceinformers "k8s.io/client-go/informers/resource/v1beta1"
3737
clientset "k8s.io/client-go/kubernetes"
3838
"k8s.io/client-go/kubernetes/scheme"
3939
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
4040
v1listers "k8s.io/client-go/listers/core/v1"
41-
resourcelisters "k8s.io/client-go/listers/resource/v1alpha3"
41+
resourcelisters "k8s.io/client-go/listers/resource/v1beta1"
4242
"k8s.io/client-go/tools/cache"
4343
"k8s.io/client-go/tools/record"
4444
"k8s.io/client-go/util/workqueue"
@@ -661,7 +661,7 @@ func (ec *Controller) handleClaim(ctx context.Context, pod *v1.Pod, podClaim v1.
661661
}
662662
metrics.ResourceClaimCreateAttempts.Inc()
663663
claimName := claim.Name
664-
claim, err = ec.kubeClient.ResourceV1alpha3().ResourceClaims(pod.Namespace).Create(ctx, claim, metav1.CreateOptions{})
664+
claim, err = ec.kubeClient.ResourceV1beta1().ResourceClaims(pod.Namespace).Create(ctx, claim, metav1.CreateOptions{})
665665
if err != nil {
666666
metrics.ResourceClaimCreateFailures.Inc()
667667
return fmt.Errorf("create ResourceClaim %s: %v", claimName, err)
@@ -730,7 +730,7 @@ func (ec *Controller) reserveForPod(ctx context.Context, pod *v1.Pod, claim *res
730730
Name: pod.Name,
731731
UID: pod.UID,
732732
})
733-
if _, err := ec.kubeClient.ResourceV1alpha3().ResourceClaims(claim.Namespace).UpdateStatus(ctx, claim, metav1.UpdateOptions{}); err != nil {
733+
if _, err := ec.kubeClient.ResourceV1beta1().ResourceClaims(claim.Namespace).UpdateStatus(ctx, claim, metav1.UpdateOptions{}); err != nil {
734734
return fmt.Errorf("reserve claim %s for pod: %w", klog.KObj(claim), err)
735735
}
736736
return nil
@@ -843,7 +843,7 @@ func (ec *Controller) syncClaim(ctx context.Context, namespace, name string) err
843843
}
844844
}
845845

846-
claim, err := ec.kubeClient.ResourceV1alpha3().ResourceClaims(claim.Namespace).UpdateStatus(ctx, claim, metav1.UpdateOptions{})
846+
claim, err := ec.kubeClient.ResourceV1beta1().ResourceClaims(claim.Namespace).UpdateStatus(ctx, claim, metav1.UpdateOptions{})
847847
if err != nil {
848848
return err
849849
}
@@ -853,7 +853,7 @@ func (ec *Controller) syncClaim(ctx context.Context, namespace, name string) err
853853
builtinControllerFinalizer := slices.Index(claim.Finalizers, resourceapi.Finalizer)
854854
if builtinControllerFinalizer >= 0 && claim.Status.Allocation == nil {
855855
claim.Finalizers = slices.Delete(claim.Finalizers, builtinControllerFinalizer, builtinControllerFinalizer+1)
856-
if _, err := ec.kubeClient.ResourceV1alpha3().ResourceClaims(claim.Namespace).Update(ctx, claim, metav1.UpdateOptions{}); err != nil {
856+
if _, err := ec.kubeClient.ResourceV1beta1().ResourceClaims(claim.Namespace).Update(ctx, claim, metav1.UpdateOptions{}); err != nil {
857857
return err
858858
}
859859
}
@@ -865,14 +865,14 @@ func (ec *Controller) syncClaim(ctx context.Context, namespace, name string) err
865865
// deleted. As above we then need to clear the allocation.
866866
claim.Status.Allocation = nil
867867
var err error
868-
claim, err = ec.kubeClient.ResourceV1alpha3().ResourceClaims(claim.Namespace).UpdateStatus(ctx, claim, metav1.UpdateOptions{})
868+
claim, err = ec.kubeClient.ResourceV1beta1().ResourceClaims(claim.Namespace).UpdateStatus(ctx, claim, metav1.UpdateOptions{})
869869
if err != nil {
870870
return err
871871
}
872872
}
873873
// Whether it was allocated or not, remove the finalizer to unblock removal.
874874
claim.Finalizers = slices.Delete(claim.Finalizers, builtinControllerFinalizer, builtinControllerFinalizer+1)
875-
_, err := ec.kubeClient.ResourceV1alpha3().ResourceClaims(claim.Namespace).Update(ctx, claim, metav1.UpdateOptions{})
875+
_, err := ec.kubeClient.ResourceV1beta1().ResourceClaims(claim.Namespace).Update(ctx, claim, metav1.UpdateOptions{})
876876
if err != nil {
877877
return err
878878
}
@@ -893,7 +893,7 @@ func (ec *Controller) syncClaim(ctx context.Context, namespace, name string) err
893893
// We are certain that the owning pod is not going to need
894894
// the claim and therefore remove the claim.
895895
logger.V(5).Info("deleting unused generated claim", "claim", klog.KObj(claim), "pod", klog.KObj(pod))
896-
err := ec.kubeClient.ResourceV1alpha3().ResourceClaims(claim.Namespace).Delete(ctx, claim.Name, metav1.DeleteOptions{})
896+
err := ec.kubeClient.ResourceV1beta1().ResourceClaims(claim.Namespace).Delete(ctx, claim.Name, metav1.DeleteOptions{})
897897
if err != nil {
898898
return fmt.Errorf("delete claim %s: %w", klog.KObj(claim), err)
899899
}

‎pkg/controller/resourceclaim/controller_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/stretchr/testify/assert"
2929

3030
v1 "k8s.io/api/core/v1"
31-
resourceapi "k8s.io/api/resource/v1alpha3"
31+
resourceapi "k8s.io/api/resource/v1beta1"
3232
apierrors "k8s.io/apimachinery/pkg/api/errors"
3333
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3434
"k8s.io/apimachinery/pkg/runtime"
@@ -387,8 +387,8 @@ func TestSyncHandler(t *testing.T) {
387387
setupMetrics()
388388
informerFactory := informers.NewSharedInformerFactory(fakeKubeClient, controller.NoResyncPeriodFunc())
389389
podInformer := informerFactory.Core().V1().Pods()
390-
claimInformer := informerFactory.Resource().V1alpha3().ResourceClaims()
391-
templateInformer := informerFactory.Resource().V1alpha3().ResourceClaimTemplates()
390+
claimInformer := informerFactory.Resource().V1beta1().ResourceClaims()
391+
templateInformer := informerFactory.Resource().V1beta1().ResourceClaimTemplates()
392392

393393
ec, err := NewController(tCtx.Logger(), tc.adminAccessEnabled, fakeKubeClient, podInformer, claimInformer, templateInformer)
394394
if err != nil {
@@ -426,7 +426,7 @@ func TestSyncHandler(t *testing.T) {
426426
t.Fatalf("unexpected success")
427427
}
428428

429-
claims, err := fakeKubeClient.ResourceV1alpha3().ResourceClaims("").List(tCtx, metav1.ListOptions{})
429+
claims, err := fakeKubeClient.ResourceV1beta1().ResourceClaims("").List(tCtx, metav1.ListOptions{})
430430
if err != nil {
431431
t.Fatalf("unexpected error while listing claims: %v", err)
432432
}
@@ -461,9 +461,9 @@ func TestResourceClaimEventHandler(t *testing.T) {
461461
setupMetrics()
462462
informerFactory := informers.NewSharedInformerFactory(fakeKubeClient, controller.NoResyncPeriodFunc())
463463
podInformer := informerFactory.Core().V1().Pods()
464-
claimInformer := informerFactory.Resource().V1alpha3().ResourceClaims()
465-
templateInformer := informerFactory.Resource().V1alpha3().ResourceClaimTemplates()
466-
claimClient := fakeKubeClient.ResourceV1alpha3().ResourceClaims(testNamespace)
464+
claimInformer := informerFactory.Resource().V1beta1().ResourceClaims()
465+
templateInformer := informerFactory.Resource().V1beta1().ResourceClaimTemplates()
466+
claimClient := fakeKubeClient.ResourceV1beta1().ResourceClaims(testNamespace)
467467

468468
_, err := NewController(tCtx.Logger(), false /* admin access */, fakeKubeClient, podInformer, claimInformer, templateInformer)
469469
tCtx.ExpectNoError(err, "creating ephemeral controller")

‎pkg/kubeapiserver/authorizer/config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
authorizationcel "k8s.io/apiserver/pkg/authorization/cel"
3535
utilfeature "k8s.io/apiserver/pkg/util/feature"
3636
versionedinformers "k8s.io/client-go/informers"
37-
resourceinformers "k8s.io/client-go/informers/resource/v1alpha3"
37+
resourceinformers "k8s.io/client-go/informers/resource/v1beta1"
3838
"k8s.io/kubernetes/pkg/auth/authorizer/abac"
3939
"k8s.io/kubernetes/pkg/auth/nodeidentifier"
4040
"k8s.io/kubernetes/pkg/features"
@@ -99,7 +99,7 @@ func (config Config) New(ctx context.Context, serverID string) (authorizer.Autho
9999
case authzconfig.AuthorizerType(modes.ModeNode):
100100
var slices resourceinformers.ResourceSliceInformer
101101
if utilfeature.DefaultFeatureGate.Enabled(features.DynamicResourceAllocation) {
102-
slices = config.VersionedInformerFactory.Resource().V1alpha3().ResourceSlices()
102+
slices = config.VersionedInformerFactory.Resource().V1beta1().ResourceSlices()
103103
}
104104
node.RegisterMetrics()
105105
graph := node.NewGraph()

‎pkg/kubelet/cm/dra/claiminfo.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"slices"
2323
"sync"
2424

25-
resourceapi "k8s.io/api/resource/v1alpha3"
25+
resourceapi "k8s.io/api/resource/v1beta1"
2626
"k8s.io/apimachinery/pkg/types"
2727
"k8s.io/apimachinery/pkg/util/sets"
2828
"k8s.io/kubernetes/pkg/kubelet/cm/dra/state"

‎pkg/kubelet/cm/dra/claiminfo_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/stretchr/testify/assert"
2626
"github.com/stretchr/testify/require"
2727

28-
resourceapi "k8s.io/api/resource/v1alpha3"
28+
resourceapi "k8s.io/api/resource/v1beta1"
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3030
"k8s.io/apimachinery/pkg/types"
3131
"k8s.io/apimachinery/pkg/util/sets"

‎pkg/kubelet/cm/dra/manager.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"time"
2424

2525
v1 "k8s.io/api/core/v1"
26-
resourceapi "k8s.io/api/resource/v1alpha3"
26+
resourceapi "k8s.io/api/resource/v1beta1"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
"k8s.io/apimachinery/pkg/types"
2929
"k8s.io/apimachinery/pkg/util/sets"
@@ -188,7 +188,7 @@ func (m *ManagerImpl) prepareResources(ctx context.Context, pod *v1.Pod) error {
188188
continue
189189
}
190190
// Query claim object from the API server
191-
resourceClaim, err := m.kubeClient.ResourceV1alpha3().ResourceClaims(pod.Namespace).Get(
191+
resourceClaim, err := m.kubeClient.ResourceV1beta1().ResourceClaims(pod.Namespace).Get(
192192
ctx,
193193
*claimName,
194194
metav1.GetOptions{})

‎pkg/kubelet/cm/dra/manager_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
"google.golang.org/grpc"
3333

3434
v1 "k8s.io/api/core/v1"
35-
resourceapi "k8s.io/api/resource/v1alpha3"
35+
resourceapi "k8s.io/api/resource/v1beta1"
3636
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3737
"k8s.io/apimachinery/pkg/types"
3838
"k8s.io/apimachinery/pkg/util/sets"
@@ -560,11 +560,11 @@ func TestPrepareResources(t *testing.T) {
560560
}
561561

562562
if test.claim != nil {
563-
if _, err := fakeKubeClient.ResourceV1alpha3().ResourceClaims(test.pod.Namespace).Create(tCtx, test.claim, metav1.CreateOptions{}); err != nil {
563+
if _, err := fakeKubeClient.ResourceV1beta1().ResourceClaims(test.pod.Namespace).Create(tCtx, test.claim, metav1.CreateOptions{}); err != nil {
564564
t.Fatalf("failed to create ResourceClaim %s: %+v", test.claim.Name, err)
565565
}
566566
defer func() {
567-
require.NoError(t, fakeKubeClient.ResourceV1alpha3().ResourceClaims(test.pod.Namespace).Delete(tCtx, test.claim.Name, metav1.DeleteOptions{}))
567+
require.NoError(t, fakeKubeClient.ResourceV1beta1().ResourceClaims(test.pod.Namespace).Delete(tCtx, test.claim.Name, metav1.DeleteOptions{}))
568568
}()
569569
}
570570

@@ -948,7 +948,7 @@ func TestParallelPrepareUnprepareResources(t *testing.T) {
948948
}
949949
claim := genTestClaim(claimName, driverName, deviceName, string(podUID))
950950

951-
if _, err = fakeKubeClient.ResourceV1alpha3().ResourceClaims(pod.Namespace).Create(tCtx, claim, metav1.CreateOptions{}); err != nil {
951+
if _, err = fakeKubeClient.ResourceV1beta1().ResourceClaims(pod.Namespace).Create(tCtx, claim, metav1.CreateOptions{}); err != nil {
952952
t.Errorf("failed to create ResourceClaim %s: %+v", claim.Name, err)
953953
return
954954
}

‎pkg/kubelet/cm/dra/plugin/registration.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"time"
2424

2525
v1 "k8s.io/api/core/v1"
26-
resourceapi "k8s.io/api/resource/v1alpha3"
26+
resourceapi "k8s.io/api/resource/v1beta1"
2727
apierrors "k8s.io/apimachinery/pkg/api/errors"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
"k8s.io/apimachinery/pkg/fields"
@@ -111,7 +111,7 @@ func (h *RegistrationHandler) wipeResourceSlices(driver string) {
111111
fieldSelector[resourceapi.ResourceSliceSelectorDriver] = driver
112112
}
113113

114-
err = h.kubeClient.ResourceV1alpha3().ResourceSlices().DeleteCollection(ctx, metav1.DeleteOptions{}, metav1.ListOptions{FieldSelector: fieldSelector.String()})
114+
err = h.kubeClient.ResourceV1beta1().ResourceSlices().DeleteCollection(ctx, metav1.DeleteOptions{}, metav1.ListOptions{FieldSelector: fieldSelector.String()})
115115
switch {
116116
case err == nil:
117117
logger.V(3).Info("Deleted ResourceSlices", "fieldSelector", fieldSelector)

‎pkg/printers/internalversion/printers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import (
4141
flowcontrolv1 "k8s.io/api/flowcontrol/v1"
4242
networkingv1beta1 "k8s.io/api/networking/v1beta1"
4343
rbacv1beta1 "k8s.io/api/rbac/v1beta1"
44-
resourceapi "k8s.io/api/resource/v1alpha3"
44+
resourceapi "k8s.io/api/resource/v1beta1"
4545
schedulingv1 "k8s.io/api/scheduling/v1"
4646
storagev1 "k8s.io/api/storage/v1"
4747
storagev1beta1 "k8s.io/api/storage/v1beta1"

0 commit comments

Comments
 (0)