Skip to content

Commit ba8303d

Browse files
MenD32MenD32
authored
Merge branch 'master' into feat/partitionable-devices-support
2 parents 4fa5202 + a929235 commit ba8303d

Some content is hidden

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

46 files changed

+505
-423
lines changed

‎cluster-autoscaler/apis/go.mod‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ go 1.24.0
55
require (
66
github.com/onsi/ginkgo/v2 v2.21.0
77
github.com/onsi/gomega v1.35.1
8-
k8s.io/apimachinery v0.34.0-beta.0
9-
k8s.io/client-go v0.34.0-beta.0
10-
k8s.io/code-generator v0.34.0-beta.0
11-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0
8+
k8s.io/apimachinery v0.34.1
9+
k8s.io/client-go v0.34.1
10+
k8s.io/code-generator v0.34.1
11+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0
1212
)
1313

1414
require (
1515
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
1616
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
17-
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
17+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
1818
github.com/go-logr/logr v1.4.2 // indirect
1919
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2020
github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -50,13 +50,12 @@ require (
5050
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
5151
gopkg.in/inf.v0 v0.9.1 // indirect
5252
gopkg.in/yaml.v3 v3.0.1 // indirect
53-
k8s.io/api v0.34.0-beta.0 // indirect
53+
k8s.io/api v0.34.1 // indirect
5454
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
5555
k8s.io/klog/v2 v2.130.1 // indirect
5656
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
5757
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
5858
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
5959
sigs.k8s.io/randfill v1.0.0 // indirect
60-
sigs.k8s.io/structured-merge-diff/v6 v6.2.0 // indirect
61-
sigs.k8s.io/yaml v1.5.0 // indirect
60+
sigs.k8s.io/yaml v1.6.0 // indirect
6261
)

‎cluster-autoscaler/apis/go.sum‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
55
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
66
github.com/emicklei/go-restful/v3 v3.12.2 h1:DhwDP0vY3k8ZzE0RunuJy8GhNpPL6zqLkDf9B/a0/xU=
77
github.com/emicklei/go-restful/v3 v3.12.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
8-
github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
9-
github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
8+
github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
9+
github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
1010
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
1111
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
1212
github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
@@ -23,7 +23,6 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
2323
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
2424
github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo=
2525
github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
26-
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
2726
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
2827
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
2928
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -142,14 +141,14 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
142141
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
143142
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
144143
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
145-
k8s.io/api v0.34.0-beta.0 h1:Yok13a6+0GTJYv56+lSNlgRjF46TLUVv+gaijkLdkB4=
146-
k8s.io/api v0.34.0-beta.0/go.mod h1:OOkMaR1spg7vtjCCQSdxgiRD0Bbp2pcTCBxJtEEb4Pk=
147-
k8s.io/apimachinery v0.34.0-beta.0 h1:C6teSJBCx6ArW7122MM9hQqeGW2w/QQ0lB4x4Z4Iftc=
148-
k8s.io/apimachinery v0.34.0-beta.0/go.mod h1:TP8uyOuDEOnzGpLOdffo8hPnIjVDljZCxCM/fruV+5M=
149-
k8s.io/client-go v0.34.0-beta.0 h1:snyuzY74xHIp7qxMYul8QRn1WxPNhs281srSl2CX9nY=
150-
k8s.io/client-go v0.34.0-beta.0/go.mod h1:KNxQTmxlWq7adFeedQLu+qVkIBTZqhghesFk41YWyBQ=
151-
k8s.io/code-generator v0.34.0-beta.0 h1:hQDiOgosKKHnudQtfcXmMEmnlg6R26S74nXhoX5O5ew=
152-
k8s.io/code-generator v0.34.0-beta.0/go.mod h1:j/nSBADI47AjHo5YONhCisOrz92tQRriMEj1KYfqJQk=
144+
k8s.io/api v0.34.1 h1:jC+153630BMdlFukegoEL8E/yT7aLyQkIVuwhmwDgJM=
145+
k8s.io/api v0.34.1/go.mod h1:SB80FxFtXn5/gwzCoN6QCtPD7Vbu5w2n1S0J5gFfTYk=
146+
k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
147+
k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
148+
k8s.io/client-go v0.34.1 h1:ZUPJKgXsnKwVwmKKdPfw4tB58+7/Ik3CrjOEhsiZ7mY=
149+
k8s.io/client-go v0.34.1/go.mod h1:kA8v0FP+tk6sZA0yKLRG67LWjqufAoSHA2xVGKw9Of8=
150+
k8s.io/code-generator v0.34.1 h1:WpphT26E+j7tEgIUfFr5WfbJrktCGzB3JoJH9149xYc=
151+
k8s.io/code-generator v0.34.1/go.mod h1:DeWjekbDnJWRwpw3s0Jat87c+e0TgkxoR4ar608yqvg=
153152
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f h1:SLb+kxmzfA87x4E4brQzB33VBbT2+x7Zq9ROIHmGn9Q=
154153
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU=
155154
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
@@ -160,13 +159,9 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8
160159
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
161160
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
162161
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
163-
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
164162
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
165163
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
166-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
167-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
168-
sigs.k8s.io/structured-merge-diff/v6 v6.2.0 h1:msyqjP8Nyd5sF3QSmJouFSzcBIdwq4ct8d1/7VSBHIQ=
169-
sigs.k8s.io/structured-merge-diff/v6 v6.2.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
170-
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
171-
sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
172-
sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=
164+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/fXCbTiQEco=
165+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
166+
sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
167+
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=

‎cluster-autoscaler/cloudprovider/brightbox/brightbox_node_group_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ func TestTemplateNodeInfo(t *testing.T) {
316316
Return(fakeServerTypezx45f(), nil)
317317
obj, err := makeFakeNodeGroup(t, testclient).TemplateNodeInfo()
318318
require.NoError(t, err)
319-
assert.Equal(t, fakeResource(), obj.ToScheduler().Allocatable)
319+
assert.Equal(t, fakeResource(), obj.ToScheduler().GetAllocatable())
320320
}
321321

322322
func TestNodeGroupErrors(t *testing.T) {

‎cluster-autoscaler/cloudprovider/clusterapi/clusterapi_nodegroup_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1648,8 +1648,8 @@ func TestNodeGroupTemplateNodeInfo(t *testing.T) {
16481648
t.Errorf("Expected the number of DRA devices in ResourceSlice to have: %d, but got: %d", config.expectedResourceSlice.gpuCount, len(resourceslice.Spec.Devices))
16491649
}
16501650
for _, device := range resourceslice.Spec.Devices {
1651-
if *device.Basic.Attributes["type"].StringValue != config.expectedResourceSlice.deviceType {
1652-
t.Errorf("Expected device type to have: %s, but got: %s", config.expectedResourceSlice.deviceType, *device.Basic.Attributes["type"].StringValue)
1651+
if *device.Attributes["type"].StringValue != config.expectedResourceSlice.deviceType {
1652+
t.Errorf("Expected device type to have: %s, but got: %s", config.expectedResourceSlice.deviceType, *device.Attributes["type"].StringValue)
16531653
}
16541654
}
16551655
}

‎cluster-autoscaler/cloudprovider/clusterapi/clusterapi_unstructured.go‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/pkg/errors"
2929
apiv1 "k8s.io/api/core/v1"
3030
corev1 "k8s.io/api/core/v1"
31-
resourceapi "k8s.io/api/resource/v1beta1"
31+
resourceapi "k8s.io/api/resource/v1"
3232
"k8s.io/apimachinery/pkg/api/resource"
3333
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3434
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -338,7 +338,7 @@ func (r unstructuredScalableResource) InstanceResourceSlices(nodeName string) ([
338338
},
339339
Spec: resourceapi.ResourceSliceSpec{
340340
Driver: driver,
341-
NodeName: nodeName,
341+
NodeName: &nodeName,
342342
Pool: resourceapi.ResourcePool{
343343
Name: nodeName,
344344
},
@@ -347,11 +347,9 @@ func (r unstructuredScalableResource) InstanceResourceSlices(nodeName string) ([
347347
for i := 0; i < int(gpuCount.Value()); i++ {
348348
device := resourceapi.Device{
349349
Name: "gpu-" + strconv.Itoa(i),
350-
Basic: &resourceapi.BasicDevice{
351-
Attributes: map[resourceapi.QualifiedName]resourceapi.DeviceAttribute{
352-
"type": {
353-
StringValue: ptr.To(GpuDeviceType),
354-
},
350+
Attributes: map[resourceapi.QualifiedName]resourceapi.DeviceAttribute{
351+
"type": {
352+
StringValue: ptr.To(GpuDeviceType),
355353
},
356354
},
357355
}

‎cluster-autoscaler/cloudprovider/clusterapi/clusterapi_unstructured_test.go‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"github.com/stretchr/testify/assert"
2626
v1 "k8s.io/api/core/v1"
27-
resourceapi "k8s.io/api/resource/v1beta1"
27+
resourceapi "k8s.io/api/resource/v1"
2828
"k8s.io/apimachinery/pkg/api/resource"
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3030
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -336,18 +336,16 @@ func TestAnnotations(t *testing.T) {
336336
},
337337
Spec: resourceapi.ResourceSliceSpec{
338338
Driver: draDriver,
339-
NodeName: testNodeName,
339+
NodeName: &testNodeName,
340340
Pool: resourceapi.ResourcePool{
341341
Name: testNodeName,
342342
},
343343
Devices: []resourceapi.Device{
344344
{
345345
Name: "gpu-0",
346-
Basic: &resourceapi.BasicDevice{
347-
Attributes: map[resourceapi.QualifiedName]resourceapi.DeviceAttribute{
348-
"type": {
349-
StringValue: ptr.To(GpuDeviceType),
350-
},
346+
Attributes: map[resourceapi.QualifiedName]resourceapi.DeviceAttribute{
347+
"type": {
348+
StringValue: ptr.To(GpuDeviceType),
351349
},
352350
},
353351
},

‎cluster-autoscaler/cloudprovider/rancher/rancher_nodegroup_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -396,19 +396,19 @@ func TestTemplateNodeInfo(t *testing.T) {
396396
t.Fatal(err)
397397
}
398398

399-
if nodeInfo.ToScheduler().Allocatable.MilliCPU != ng.resources.Cpu().MilliValue() {
399+
if nodeInfo.ToScheduler().GetAllocatable().GetMilliCPU() != ng.resources.Cpu().MilliValue() {
400400
t.Fatalf("expected nodeInfo to have %v MilliCPU, got %v",
401-
ng.resources.Cpu().MilliValue(), nodeInfo.ToScheduler().Allocatable.MilliCPU)
401+
ng.resources.Cpu().MilliValue(), nodeInfo.ToScheduler().GetAllocatable().GetMilliCPU())
402402
}
403403

404-
if nodeInfo.ToScheduler().Allocatable.Memory != ng.resources.Memory().Value() {
404+
if nodeInfo.ToScheduler().GetAllocatable().GetMemory() != ng.resources.Memory().Value() {
405405
t.Fatalf("expected nodeInfo to have %v Memory, got %v",
406-
ng.resources.Memory().Value(), nodeInfo.ToScheduler().Allocatable.Memory)
406+
ng.resources.Memory().Value(), nodeInfo.ToScheduler().GetAllocatable().GetMemory())
407407
}
408408

409-
if nodeInfo.ToScheduler().Allocatable.EphemeralStorage != ng.resources.StorageEphemeral().Value() {
409+
if nodeInfo.ToScheduler().GetAllocatable().GetEphemeralStorage() != ng.resources.StorageEphemeral().Value() {
410410
t.Fatalf("expected nodeInfo to have %v ephemeral storage, got %v",
411-
ng.resources.StorageEphemeral().Value(), nodeInfo.ToScheduler().Allocatable.EphemeralStorage)
411+
ng.resources.StorageEphemeral().Value(), nodeInfo.ToScheduler().GetAllocatable().GetEphemeralStorage())
412412
}
413413
}
414414

‎cluster-autoscaler/core/scaledown/eligibility/eligibility_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/google/go-cmp/cmp"
2525

2626
apiv1 "k8s.io/api/core/v1"
27-
resourceapi "k8s.io/api/resource/v1beta1"
27+
resourceapi "k8s.io/api/resource/v1"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
testprovider "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/test"
3030
"k8s.io/autoscaler/cluster-autoscaler/config"
@@ -75,11 +75,12 @@ func getTestCases(ignoreDaemonSetsUtilization bool, suffix string, now time.Time
7575
dsPod.Spec.NodeName = "regular"
7676

7777
brokenUtilNode := BuildTestNode("regular", 0, 0)
78+
resourceSliceNodeName := "regular"
7879
regularNodeIncompleteResourceSlice := &resourceapi.ResourceSlice{
7980
ObjectMeta: metav1.ObjectMeta{Name: "regularNodeIncompleteResourceSlice", UID: "regularNodeIncompleteResourceSlice"},
8081
Spec: resourceapi.ResourceSliceSpec{
8182
Driver: "driver.foo.com",
82-
NodeName: "regular",
83+
NodeName: &resourceSliceNodeName,
8384
Pool: resourceapi.ResourcePool{
8485
Name: "regular-pool",
8586
ResourceSliceCount: 999,

‎cluster-autoscaler/core/static_autoscaler_dra_test.go‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
appsv1 "k8s.io/api/apps/v1"
3131
apiv1 "k8s.io/api/core/v1"
3232
policyv1 "k8s.io/api/policy/v1"
33-
resourceapi "k8s.io/api/resource/v1beta1"
33+
resourceapi "k8s.io/api/resource/v1"
3434
"k8s.io/apimachinery/pkg/api/resource"
3535
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3636
"k8s.io/apimachinery/pkg/labels"
@@ -603,15 +603,17 @@ func testResourceClaim(claimName string, owningPod *apiv1.Pod, nodeName string,
603603
selectors = append(selectors, resourceapi.DeviceSelector{CEL: &resourceapi.CELDeviceSelector{Expression: selector}})
604604
}
605605
deviceRequest := resourceapi.DeviceRequest{
606-
Name: request.name,
607-
DeviceClassName: "default-class",
608-
Selectors: selectors,
606+
Name: request.name,
607+
Exactly: &resourceapi.ExactDeviceRequest{
608+
DeviceClassName: "default-class",
609+
Selectors: selectors,
610+
},
609611
}
610612
if request.all {
611-
deviceRequest.AllocationMode = resourceapi.DeviceAllocationModeAll
613+
deviceRequest.Exactly.AllocationMode = resourceapi.DeviceAllocationModeAll
612614
} else {
613-
deviceRequest.AllocationMode = resourceapi.DeviceAllocationModeExactCount
614-
deviceRequest.Count = request.count
615+
deviceRequest.Exactly.AllocationMode = resourceapi.DeviceAllocationModeExactCount
616+
deviceRequest.Exactly.Count = request.count
615617
}
616618
deviceRequests = append(deviceRequests, deviceRequest)
617619
}
@@ -711,9 +713,10 @@ func testResourceSlices(driver, poolName string, poolSliceCount, poolGen int64,
711713
}
712714

713715
if avail.node != "" {
714-
slice.Spec.NodeName = avail.node
716+
slice.Spec.NodeName = &avail.node
715717
} else if avail.all {
716-
slice.Spec.AllNodes = true
718+
v := true
719+
slice.Spec.AllNodes = &v
717720
} else if len(avail.nodes) > 0 {
718721
slice.Spec.NodeSelector = &apiv1.NodeSelector{
719722
NodeSelectorTerms: []apiv1.NodeSelectorTerm{
@@ -728,18 +731,16 @@ func testResourceSlices(driver, poolName string, poolSliceCount, poolGen int64,
728731
var devices []resourceapi.Device
729732
for _, deviceDef := range deviceDefs {
730733
device := resourceapi.Device{
731-
Name: deviceDef.name,
732-
Basic: &resourceapi.BasicDevice{
733-
Attributes: map[resourceapi.QualifiedName]resourceapi.DeviceAttribute{},
734-
Capacity: map[resourceapi.QualifiedName]resourceapi.DeviceCapacity{},
735-
},
734+
Name: deviceDef.name,
735+
Attributes: map[resourceapi.QualifiedName]resourceapi.DeviceAttribute{},
736+
Capacity: map[resourceapi.QualifiedName]resourceapi.DeviceCapacity{},
736737
}
737738
for name, val := range deviceDef.attributes {
738739
val := val
739-
device.Basic.Attributes[resourceapi.QualifiedName(driver+"/"+name)] = resourceapi.DeviceAttribute{StringValue: &val}
740+
device.Attributes[resourceapi.QualifiedName(driver+"/"+name)] = resourceapi.DeviceAttribute{StringValue: &val}
740741
}
741742
for name, quantity := range deviceDef.capacity {
742-
device.Basic.Capacity[resourceapi.QualifiedName(name)] = resourceapi.DeviceCapacity{Value: resource.MustParse(quantity)}
743+
device.Capacity[resourceapi.QualifiedName(name)] = resourceapi.DeviceCapacity{Value: resource.MustParse(quantity)}
743744
}
744745
devices = append(devices, device)
745746
}

‎cluster-autoscaler/core/static_autoscaler_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
appsv1 "k8s.io/api/apps/v1"
3636
apiv1 "k8s.io/api/core/v1"
3737
policyv1 "k8s.io/api/policy/v1"
38-
resourceapi "k8s.io/api/resource/v1beta1"
38+
resourceapi "k8s.io/api/resource/v1"
3939
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
4040
"k8s.io/apimachinery/pkg/labels"
4141
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"

0 commit comments

Comments
 (0)