Skip to content

Commit 146f959

Browse files
committed
feat: update to v1beta1
Signed-off-by: Paul Bastide <[email protected]>
1 parent 7b28c49 commit 146f959

File tree

20 files changed

+632
-217
lines changed

20 files changed

+632
-217
lines changed

cmd/power-dra-kubeletplugin/discovery.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"math/rand"
2222
"os"
2323

24-
resourceapi "k8s.io/api/resource/v1alpha3"
24+
resourceapi "k8s.io/api/resource/v1beta1"
2525
"k8s.io/apimachinery/pkg/api/resource"
2626
"k8s.io/utils/ptr"
2727

@@ -51,8 +51,10 @@ func enumerateAllPossibleDevices(numGPUs int) (AllocatableDevices, error) {
5151
VersionValue: ptr.To("0.1.0"),
5252
},
5353
},
54-
Capacity: map[resourceapi.QualifiedName]resource.Quantity{
55-
"memory": resource.MustParse("80Gi"),
54+
Capacity: map[resourceapi.QualifiedName]resourceapi.DeviceCapacity{
55+
"memory": {
56+
Value: resource.MustParse("80Gi"),
57+
},
5658
},
5759
},
5860
}

cmd/power-dra-kubeletplugin/driver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func (d *driver) NodePrepareResources(ctx context.Context, req *drapbv1.NodePrep
8989
}
9090

9191
func (d *driver) nodePrepareResource(ctx context.Context, claim *drapbv1.Claim) *drapbv1.NodePrepareResourceResponse {
92-
resourceClaim, err := d.client.ResourceV1alpha3().ResourceClaims(claim.Namespace).Get(
92+
resourceClaim, err := d.client.ResourceV1beta1().ResourceClaims(claim.Namespace).Get(
9393
ctx,
9494
claim.Name,
9595
metav1.GetOptions{})

cmd/power-dra-kubeletplugin/state.go

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

24-
resourceapi "k8s.io/api/resource/v1alpha3"
24+
resourceapi "k8s.io/api/resource/v1beta1"
2525
"k8s.io/apimachinery/pkg/runtime"
2626
drapbv1 "k8s.io/kubelet/pkg/apis/dra/v1beta1"
2727
"k8s.io/kubernetes/pkg/kubelet/checkpointmanager"

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
k8s.io/apimachinery v0.32.3
1212
k8s.io/client-go v0.32.3
1313
k8s.io/component-base v0.32.3
14-
k8s.io/dynamic-resource-allocation v0.32.0-alpha.1
14+
k8s.io/dynamic-resource-allocation v0.32.3
1515
k8s.io/klog/v2 v2.130.1
1616
k8s.io/kubelet v0.32.3
1717
k8s.io/kubernetes v1.32.3

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,8 @@ k8s.io/component-base v0.32.3 h1:98WJvvMs3QZ2LYHBzvltFSeJjEx7t5+8s71P7M74u8k=
226226
k8s.io/component-base v0.32.3/go.mod h1:LWi9cR+yPAv7cu2X9rZanTiFKB2kHA+JjmhkKjCZRpI=
227227
k8s.io/dynamic-resource-allocation v0.32.0-alpha.1 h1:aIbAVQ3cFT/TLAQf2LRv9qTQue1HuWuVOQVe4vK3Gn0=
228228
k8s.io/dynamic-resource-allocation v0.32.0-alpha.1/go.mod h1:Ghjd6w1CdjmcUNY9UpVG++5tfkzef08cVOUiUy6IERk=
229+
k8s.io/dynamic-resource-allocation v0.32.3 h1:O4wDtJjwq8IVS2DHVrs/BDPdcFeoLlCNZP7wU3f0I2c=
230+
k8s.io/dynamic-resource-allocation v0.32.3/go.mod h1:ei9nf36kdieNHJqLf1eoKfhwMHMTFCkdngJQSiI9xEs=
229231
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
230232
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
231233
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=

vendor/k8s.io/client-go/informers/resource/v1alpha3/deviceclass.go renamed to vendor/k8s.io/client-go/informers/resource/v1beta1/deviceclass.go

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/client-go/informers/resource/v1alpha3/interface.go renamed to vendor/k8s.io/client-go/informers/resource/v1beta1/interface.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/client-go/informers/resource/v1alpha3/resourceclaim.go renamed to vendor/k8s.io/client-go/informers/resource/v1beta1/resourceclaim.go

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/client-go/informers/resource/v1alpha3/resourceclaimtemplate.go renamed to vendor/k8s.io/client-go/informers/resource/v1beta1/resourceclaimtemplate.go

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/client-go/informers/resource/v1alpha3/resourceslice.go renamed to vendor/k8s.io/client-go/informers/resource/v1beta1/resourceslice.go

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)