Skip to content

Commit 5e8f4f9

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #69 from klueska/update-1.32
Update deployment for Kubernetes 1.32.0
2 parents 5ff76f1 + eb89e97 commit 5e8f4f9

File tree

15 files changed

+142
-124
lines changed

15 files changed

+142
-124
lines changed

‎README.md‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -92,21 +92,21 @@ And show the initial state of available GPU devices on the worker node:
9292
$ kubectl get resourceslice -o yaml
9393
apiVersion: v1
9494
items:
95-
- apiVersion: resource.k8s.io/v1alpha3
95+
- apiVersion: resource.k8s.io/v1beta1
9696
kind: ResourceSlice
9797
metadata:
98-
creationTimestamp: "2024-07-16T13:00:06Z"
98+
creationTimestamp: "2024-12-09T16:17:09Z"
9999
generateName: dra-example-driver-cluster-worker-gpu.example.com-
100100
generation: 1
101-
name: dra-example-driver-cluster-worker-gpu.example.com-xhsqf
101+
name: dra-example-driver-cluster-worker-gpu.example.com-rf2f7
102102
ownerReferences:
103103
- apiVersion: v1
104104
controller: true
105105
kind: Node
106106
name: dra-example-driver-cluster-worker
107-
uid: 8a18f216-bd77-426a-86b1-a989bdacc135
108-
resourceVersion: "854"
109-
uid: ea955e01-eaf0-45ed-8a36-1c56e4b8bced
107+
uid: 6633c2e1-d947-40c3-ba1f-78f3c9aad05c
108+
resourceVersion: "530"
109+
uid: d13fd8bd-0a71-43e1-ba79-ebd2fae4847a
110110
spec:
111111
driver: gpu.example.com
112112
nodeName: dra-example-driver-cluster-worker
@@ -126,7 +126,8 @@ items:
126126
uuid:
127127
string: gpu-18db0e85-99e9-c746-8531-ffeb86328b39
128128
capacity:
129-
memory: 80Gi
129+
memory:
130+
value: 80Gi
130131
name: gpu-0
131132
- basic:
132133
attributes:
@@ -139,7 +140,8 @@ items:
139140
uuid:
140141
string: gpu-93d37703-997c-c46f-a531-755e3e0dc2ac
141142
capacity:
142-
memory: 80Gi
143+
memory:
144+
value: 80Gi
143145
name: gpu-1
144146
- basic:
145147
attributes:
@@ -152,7 +154,8 @@ items:
152154
uuid:
153155
string: gpu-ee3e4b55-fcda-44b8-0605-64b7a9967744
154156
capacity:
155-
memory: 80Gi
157+
memory:
158+
value: 80Gi
156159
name: gpu-2
157160
- basic:
158161
attributes:
@@ -165,7 +168,8 @@ items:
165168
uuid:
166169
string: gpu-9ede7e32-5825-a11b-fa3d-bab6d47e0243
167170
capacity:
168-
memory: 80Gi
171+
memory:
172+
value: 80Gi
169173
name: gpu-3
170174
- basic:
171175
attributes:
@@ -178,7 +182,8 @@ items:
178182
uuid:
179183
string: gpu-e7b42cb1-4fd8-91b2-bc77-352a0c1f5747
180184
capacity:
181-
memory: 80Gi
185+
memory:
186+
value: 80Gi
182187
name: gpu-4
183188
- basic:
184189
attributes:
@@ -191,7 +196,8 @@ items:
191196
uuid:
192197
string: gpu-f11773a1-5bfb-e48b-3d98-1beb5baaf08e
193198
capacity:
194-
memory: 80Gi
199+
memory:
200+
value: 80Gi
195201
name: gpu-5
196202
- basic:
197203
attributes:
@@ -204,7 +210,8 @@ items:
204210
uuid:
205211
string: gpu-0159f35e-99ee-b2b5-74f1-9d18df3f22ac
206212
capacity:
207-
memory: 80Gi
213+
memory:
214+
value: 80Gi
208215
name: gpu-6
209216
- basic:
210217
attributes:
@@ -217,7 +224,8 @@ items:
217224
uuid:
218225
string: gpu-657bd2e7-f5c2-a7f2-fbaa-0d1cdc32f81b
219226
capacity:
220-
memory: 80Gi
227+
memory:
228+
value: 80Gi
221229
name: gpu-7
222230
kind: List
223231
metadata:

‎cmd/dra-example-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("1.0.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/dra-example-kubeletplugin/driver.go‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import (
2525
"k8s.io/dynamic-resource-allocation/kubeletplugin"
2626
"k8s.io/klog/v2"
2727

28-
drapbv1 "k8s.io/kubelet/pkg/apis/dra/v1alpha4"
28+
drapbv1 "k8s.io/kubelet/pkg/apis/dra/v1beta1"
2929
)
3030

31-
var _ drapbv1.NodeServer = &driver{}
31+
var _ drapbv1.DRAPluginServer = &driver{}
3232

3333
type driver struct {
3434
client coreclientset.Interface
@@ -49,7 +49,7 @@ func NewDriver(ctx context.Context, config *Config) (*driver, error) {
4949

5050
plugin, err := kubeletplugin.Start(
5151
ctx,
52-
driver,
52+
[]any{driver},
5353
kubeletplugin.KubeClient(config.coreclient),
5454
kubeletplugin.NodeName(config.flags.nodeName),
5555
kubeletplugin.DriverName(DriverName),
@@ -65,7 +65,10 @@ func NewDriver(ctx context.Context, config *Config) (*driver, error) {
6565
for _, device := range state.allocatable {
6666
resources.Devices = append(resources.Devices, device)
6767
}
68-
plugin.PublishResources(ctx, resources)
68+
69+
if err := plugin.PublishResources(ctx, resources); err != nil {
70+
return nil, err
71+
}
6972

7073
return driver, nil
7174
}
@@ -87,7 +90,7 @@ func (d *driver) NodePrepareResources(ctx context.Context, req *drapbv1.NodePrep
8790
}
8891

8992
func (d *driver) nodePrepareResource(ctx context.Context, claim *drapbv1.Claim) *drapbv1.NodePrepareResourceResponse {
90-
resourceClaim, err := d.client.ResourceV1alpha3().ResourceClaims(claim.Namespace).Get(
93+
resourceClaim, err := d.client.ResourceV1beta1().ResourceClaims(claim.Namespace).Get(
9194
ctx,
9295
claim.Name,
9396
metav1.GetOptions{})

‎cmd/dra-example-kubeletplugin/state.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ 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"
26-
drapbv1 "k8s.io/kubelet/pkg/apis/dra/v1alpha4"
26+
drapbv1 "k8s.io/kubelet/pkg/apis/dra/v1beta1"
2727
"k8s.io/kubernetes/pkg/kubelet/checkpointmanager"
2828

2929
configapi "sigs.k8s.io/dra-example-driver/api/example.com/resource/gpu/v1alpha1"

‎demo/gpu-test1.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
name: gpu-test1
99

1010
---
11-
apiVersion: resource.k8s.io/v1alpha3
11+
apiVersion: resource.k8s.io/v1beta1
1212
kind: ResourceClaimTemplate
1313
metadata:
1414
namespace: gpu-test1

‎demo/gpu-test2.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
name: gpu-test2
99

1010
---
11-
apiVersion: resource.k8s.io/v1alpha3
11+
apiVersion: resource.k8s.io/v1beta1
1212
kind: ResourceClaimTemplate
1313
metadata:
1414
namespace: gpu-test2

‎demo/gpu-test3.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
name: gpu-test3
99

1010
---
11-
apiVersion: resource.k8s.io/v1alpha3
11+
apiVersion: resource.k8s.io/v1beta1
1212
kind: ResourceClaimTemplate
1313
metadata:
1414
namespace: gpu-test3

‎demo/gpu-test4.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
name: gpu-test4
99

1010
---
11-
apiVersion: resource.k8s.io/v1alpha3
11+
apiVersion: resource.k8s.io/v1beta1
1212
kind: ResourceClaim
1313
metadata:
1414
namespace: gpu-test4

‎demo/gpu-test5.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
name: gpu-test5
99

1010
---
11-
apiVersion: resource.k8s.io/v1alpha3
11+
apiVersion: resource.k8s.io/v1beta1
1212
kind: ResourceClaimTemplate
1313
metadata:
1414
namespace: gpu-test5

‎demo/scripts/common.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ SCRIPTS_DIR="$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)"
3636

3737
# The kubernetes tag to build the kind cluster from
3838
# From ${KIND_K8S_REPO}/tags
39-
: ${KIND_K8S_TAG:="v1.31.0"}
39+
: ${KIND_K8S_TAG:="v1.32.0"}
4040

4141
# At present, kind has a new enough node image that we don't need to build our
4242
# own. This won't always be true and we may need to set the variable below to

0 commit comments

Comments
 (0)