Skip to content

Commit d260381

Browse files
committed
Update resource api to use v1, add missing DRA methods
1 parent 51b44d7 commit d260381

33 files changed

+119
-58
lines changed

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: 1 addition & 1 deletion
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"

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

Lines changed: 1 addition & 1 deletion
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"

cluster-autoscaler/core/static_autoscaler_dra_test.go

Lines changed: 1 addition & 1 deletion
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"

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"

cluster-autoscaler/processors/customresources/dra_processor.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ package customresources
1818

1919
import (
2020
apiv1 "k8s.io/api/core/v1"
21-
"k8s.io/api/resource/v1beta1"
21+
resourceapi "k8s.io/api/resource/v1"
22+
2223
"k8s.io/apimachinery/pkg/util/sets"
2324
"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
2425
"k8s.io/autoscaler/cluster-autoscaler/context"
@@ -87,7 +88,7 @@ type resourceSliceSpecs struct {
8788
pool string
8889
}
8990

90-
func isEqualResourceSlices(nodeResourcesSlices []*v1beta1.ResourceSlice, templateResourcesSlices []*v1beta1.ResourceSlice) bool {
91+
func isEqualResourceSlices(nodeResourcesSlices []*resourceapi.ResourceSlice, templateResourcesSlices []*resourceapi.ResourceSlice) bool {
9192
tempSlicesByPools := getDevicesBySpecs(templateResourcesSlices)
9293
nodeSlicesByPools := getDevicesBySpecs(nodeResourcesSlices)
9394

@@ -108,7 +109,7 @@ func isEqualResourceSlices(nodeResourcesSlices []*v1beta1.ResourceSlice, templat
108109
return true
109110
}
110111

111-
func getDevicesBySpecs(resourcesSlices []*v1beta1.ResourceSlice) map[resourceSliceSpecs]sets.Set[string] {
112+
func getDevicesBySpecs(resourcesSlices []*resourceapi.ResourceSlice) map[resourceSliceSpecs]sets.Set[string] {
112113
slicesGroupedByPoolAndDriver := make(map[resourceSliceSpecs]sets.Set[string])
113114
for _, rs := range resourcesSlices {
114115
rsSpecs := resourceSliceSpecs{
@@ -120,7 +121,7 @@ func getDevicesBySpecs(resourcesSlices []*v1beta1.ResourceSlice) map[resourceSli
120121
return slicesGroupedByPoolAndDriver
121122
}
122123

123-
func getResourceSliceDevicesSet(resourcesSlice *v1beta1.ResourceSlice) sets.Set[string] {
124+
func getResourceSliceDevicesSet(resourcesSlice *resourceapi.ResourceSlice) sets.Set[string] {
124125
devices := sets.New[string]()
125126
for _, device := range resourcesSlice.Spec.Devices {
126127
devices.Insert(device.Name)

cluster-autoscaler/processors/customresources/dra_processor_test.go

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

24-
resourceapi "k8s.io/api/resource/v1beta1"
24+
resourceapi "k8s.io/api/resource/v1"
2525
"k8s.io/autoscaler/cluster-autoscaler/simulator/clustersnapshot/store"
2626
"k8s.io/autoscaler/cluster-autoscaler/simulator/clustersnapshot/testsnapshot"
2727
drasnapshot "k8s.io/autoscaler/cluster-autoscaler/simulator/dynamicresources/snapshot"

cluster-autoscaler/simulator/clustersnapshot/predicate/predicate_snapshot.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"fmt"
2121

2222
apiv1 "k8s.io/api/core/v1"
23-
resourceapi "k8s.io/api/resource/v1beta1"
23+
resourceapi "k8s.io/api/resource/v1"
2424
"k8s.io/autoscaler/cluster-autoscaler/simulator/clustersnapshot"
2525
drautils "k8s.io/autoscaler/cluster-autoscaler/simulator/dynamicresources/utils"
2626
"k8s.io/autoscaler/cluster-autoscaler/simulator/framework"

cluster-autoscaler/simulator/clustersnapshot/predicate/predicate_snapshot_dra_benchmark_test.go

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

2323
"github.com/google/uuid"
2424
apiv1 "k8s.io/api/core/v1"
25-
resourceapi "k8s.io/api/resource/v1beta1"
25+
resourceapi "k8s.io/api/resource/v1"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
"k8s.io/apimachinery/pkg/types"
2828
"k8s.io/apiserver/pkg/util/feature"

cluster-autoscaler/simulator/clustersnapshot/predicate/predicate_snapshot_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/stretchr/testify/assert" // TODO: Migrate the rest of the assertions to cmp for consistency.
2929

3030
apiv1 "k8s.io/api/core/v1"
31-
resourceapi "k8s.io/api/resource/v1beta1"
31+
resourceapi "k8s.io/api/resource/v1"
3232
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3333
"k8s.io/apimachinery/pkg/types"
3434
"k8s.io/apiserver/pkg/util/feature"

0 commit comments

Comments
 (0)