fix: updated resourceapi to v1

Signed-off-by: MenD32 <[email protected]>

Author: MenD32

cluster-autoscaler/simulator/dynamicresources/utils/utilization.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 
 	v1 "k8s.io/api/core/v1"
-	resourceapi "k8s.io/api/resource/v1beta1"
+	resourceapi "k8s.io/api/resource/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/autoscaler/cluster-autoscaler/simulator/framework"
 )
@@ -89,13 +89,13 @@ func calculatePoolUtil(unallocated, allocated []resourceapi.Device, resourceSlic
 	devicesWithoutCounters := 0
 
 	for _, device := range allocated {
-		if device.Basic == nil || device.Basic.ConsumesCounters == nil {
+		if device.ConsumesCounters == nil {
 			devicesWithoutCounters++
 			allocatedDevicesWithoutCounters++
 		}
 	}
 	for _, device := range unallocated {
-		if device.Basic == nil || device.Basic.ConsumesCounters == nil {
+		if device.ConsumesCounters == nil {
 			devicesWithoutCounters++
 		}
 	}
@@ -126,13 +126,10 @@ func calculatePoolUtil(unallocated, allocated []resourceapi.Device, resourceSlic
 func calculateConsumedCounters(devices []resourceapi.Device) map[string]map[string]resource.Quantity {
 	countersConsumed := map[string]map[string]resource.Quantity{}
 	for _, device := range devices {
-		if device.Basic == nil {
+		if device.ConsumesCounters == nil {
 			continue
 		}
-		if device.Basic.ConsumesCounters == nil {
-			continue
-		}
-		for _, consumedCounter := range device.Basic.ConsumesCounters {
+		for _, consumedCounter := range device.ConsumesCounters {
 			if _, ok := countersConsumed[consumedCounter.CounterSet]; !ok {
 				countersConsumed[consumedCounter.CounterSet] = map[string]resource.Quantity{}
 			}

cluster-autoscaler/simulator/dynamicresources/utils/utilization_test.go

@@ -24,7 +24,7 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 
 	apiv1 "k8s.io/api/core/v1"
-	resourceapi "k8s.io/api/resource/v1beta1"
+	resourceapi "k8s.io/api/resource/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -220,19 +220,17 @@ func testResourceSlicesWithPartionableDevices(driverName, poolName, nodeName str
 			devices,
 			resourceapi.Device{
 				Name: fmt.Sprintf("gpu-0-partition-%d", i),
-				Basic: &resourceapi.BasicDevice{
-					Capacity: map[resourceapi.QualifiedName]resourceapi.DeviceCapacity{
-						"memory": {
-							Value: resource.MustParse("10Gi"),
-						},
+				Capacity: map[resourceapi.QualifiedName]resourceapi.DeviceCapacity{
+					"memory": {
+						Value: resource.MustParse("10Gi"),
 					},
-					ConsumesCounters: []resourceapi.DeviceCounterConsumption{
-						{
-							CounterSet: "gpu-0-counter-set",
-							Counters: map[string]resourceapi.Counter{
-								"memory": {
-									Value: resource.MustParse("10Gi"),
-								},
+				},
+				ConsumesCounters: []resourceapi.DeviceCounterConsumption{
+					{
+						CounterSet: "gpu-0-counter-set",
+						Counters: map[string]resourceapi.Counter{
+							"memory": {
+								Value: resource.MustParse("10Gi"),
 							},
 						},
 					},
@@ -243,19 +241,17 @@ func testResourceSlicesWithPartionableDevices(driverName, poolName, nodeName str
 	devices = append(devices,
 		resourceapi.Device{
 			Name: "gpu-0",
-			Basic: &resourceapi.BasicDevice{
-				Capacity: map[resourceapi.QualifiedName]resourceapi.DeviceCapacity{
-					"memory": {
-						Value: resource.MustParse(fmt.Sprintf("%dGi", 10*partitionCount)),
-					},
+			Capacity: map[resourceapi.QualifiedName]resourceapi.DeviceCapacity{
+				"memory": {
+					Value: resource.MustParse(fmt.Sprintf("%dGi", 10*partitionCount)),
 				},
-				ConsumesCounters: []resourceapi.DeviceCounterConsumption{
-					{
-						CounterSet: "gpu-0-counter-set",
-						Counters: map[string]resourceapi.Counter{
-							"memory": {
-								Value: resource.MustParse(fmt.Sprintf("%dGi", 10*partitionCount)),
-							},
+			},
+			ConsumesCounters: []resourceapi.DeviceCounterConsumption{
+				{
+					CounterSet: "gpu-0-counter-set",
+					Counters: map[string]resourceapi.Counter{
+						"memory": {
+							Value: resource.MustParse(fmt.Sprintf("%dGi", 10*partitionCount)),
 						},
 					},
 				},
@@ -266,7 +262,7 @@ func testResourceSlicesWithPartionableDevices(driverName, poolName, nodeName str
 		ObjectMeta: metav1.ObjectMeta{Name: sliceName, UID: types.UID(sliceName)},
 		Spec: resourceapi.ResourceSliceSpec{
 			Driver:   driverName,
-			NodeName: nodeName,
+			NodeName: &nodeName,
 			Pool:     resourceapi.ResourcePool{Name: poolName, Generation: int64(poolGen), ResourceSliceCount: 1},
 			Devices:  devices,
 			SharedCounters: []resourceapi.CounterSet{