Adapt code to kubernetes v1.34

Author: marquiz

pkg/resourcemonitor/noderesourcesaggregator.go

@@ -304,7 +304,7 @@ func makeNodeAllocatable(devices []*podresourcesapi.ContainerDevices, memoryBloc
 
 			// I do not like the idea to cast from uint64 to int64, but until the memory size does not go over
 			// 8589934592Gi, it should be ok
-			perNUMAAllocatable[nodeID][memoryType] += int64(block.GetSize_())
+			perNUMAAllocatable[nodeID][memoryType] += int64(block.GetSize())
 		}
 	}
 

pkg/resourcemonitor/noderesourcesaggregator_test.go

@@ -135,7 +135,7 @@ func TestResourcesAggregator(t *testing.T) {
 			Memory: []*v1.ContainerMemory{
 				{
 					MemoryType: "memory",
-					Size_:      1024,
+					Size:       1024,
 					Topology: &v1.TopologyInfo{
 						Nodes: []*v1.NUMANode{
 							{
@@ -146,7 +146,7 @@ func TestResourcesAggregator(t *testing.T) {
 				},
 				{
 					MemoryType: "memory",
-					Size_:      1024,
+					Size:       1024,
 					Topology: &v1.TopologyInfo{
 						Nodes: []*v1.NUMANode{
 							{
@@ -157,7 +157,7 @@ func TestResourcesAggregator(t *testing.T) {
 				},
 				{
 					MemoryType: "hugepages-2Mi",
-					Size_:      1024,
+					Size:       1024,
 					Topology: &v1.TopologyInfo{
 						Nodes: []*v1.NUMANode{
 							{
@@ -332,7 +332,7 @@ func TestResourcesAggregator(t *testing.T) {
 			Memory: []*v1.ContainerMemory{
 				{
 					MemoryType: "memory",
-					Size_:      1024,
+					Size:       1024,
 					Topology: &v1.TopologyInfo{
 						Nodes: []*v1.NUMANode{
 							{
@@ -343,7 +343,7 @@ func TestResourcesAggregator(t *testing.T) {
 				},
 				{
 					MemoryType: "memory",
-					Size_:      1024,
+					Size:       1024,
 					Topology: &v1.TopologyInfo{
 						Nodes: []*v1.NUMANode{
 							{
@@ -354,7 +354,7 @@ func TestResourcesAggregator(t *testing.T) {
 				},
 				{
 					MemoryType: "hugepages-2Mi",
-					Size_:      1024,
+					Size:       1024,
 					Topology: &v1.TopologyInfo{
 						Nodes: []*v1.NUMANode{
 							{

pkg/resourcemonitor/podresourcesscanner.go

@@ -179,14 +179,14 @@ func (resMon *PodResourcesScanner) Scan() (ScanResponse, error) {
 			}
 
 			for _, block := range container.GetMemory() {
-				if block.GetSize_() == 0 {
+				if block.GetSize() == 0 {
 					continue
 				}
 
 				topology := getNumaNodeIds(block.GetTopology())
 				contRes.Resources = append(contRes.Resources, ResourceInfo{
 					Name:        corev1.ResourceName(block.MemoryType),
-					Data:        []string{fmt.Sprintf("%d", block.GetSize_())},
+					Data:        []string{fmt.Sprintf("%d", block.GetSize())},
 					NumaNodeIds: topology,
 				})
 			}

pkg/resourcemonitor/podresourcesscanner_test.go

@@ -112,7 +112,7 @@ func TestPodScanner(t *testing.T) {
 								Memory: []*v1.ContainerMemory{
 									{
 										MemoryType: "hugepages-2Mi",
-										Size_:      512,
+										Size:       512,
 										Topology: &v1.TopologyInfo{
 											Nodes: []*v1.NUMANode{
 												{ID: 1},
@@ -121,7 +121,7 @@ func TestPodScanner(t *testing.T) {
 									},
 									{
 										MemoryType: "memory",
-										Size_:      512,
+										Size:       512,
 										Topology: &v1.TopologyInfo{
 											Nodes: []*v1.NUMANode{
 												{ID: 0},

pkg/utils/kubeconf/kubelet_config_file.go

@@ -17,6 +17,7 @@ limitations under the License.
 package kubeconf
 
 import (
+	"context"
 	"fmt"
 
 	kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1"
@@ -36,7 +37,7 @@ func GetKubeletConfigFromLocalFile(kubeletConfigPath string) (*kubeletconfigv1be
 		return nil, fmt.Errorf(errFmt, kubeletConfigPath, err)
 	}
 
-	kc, err := loader.Load()
+	kc, err := loader.Load(context.Background())
 	if err != nil {
 		return nil, fmt.Errorf(errFmt, kubeletConfigPath, err)
 	}