CA: update NewNodeInfo and NewPodInfo callers (boilerplate)

Choraden · Choraden · commit e87265e83b27 · 2026-03-23T10:34:17.000Z
diff --git a/cluster-autoscaler/cloudprovider/alicloud/alicloud_auto_scaling_group.go b/cluster-autoscaler/cloudprovider/alicloud/alicloud_auto_scaling_group.go
@@ -196,7 +196,7 @@ func (asg *Asg) TemplateNodeInfo() (*framework.NodeInfo, error) {
 		return nil, err
 	}
 
-	nodeInfo := framework.NewNodeInfo(node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(asg.id)})
+	nodeInfo := framework.NewNodeInfo(node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(asg.id), nil))
 	return nodeInfo, nil
 }
 
diff --git a/cluster-autoscaler/cloudprovider/aws/aws_cloud_provider.go b/cluster-autoscaler/cloudprovider/aws/aws_cloud_provider.go
@@ -411,7 +411,7 @@ func (ng *AwsNodeGroup) TemplateNodeInfo() (*framework.NodeInfo, error) {
 		return nil, err
 	}
 
-	nodeInfo := framework.NewNodeInfo(node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(ng.asg.Name)})
+	nodeInfo := framework.NewNodeInfo(node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(ng.asg.Name), nil))
 	return nodeInfo, nil
 }
 
diff --git a/cluster-autoscaler/cloudprovider/azure/azure_scale_set.go b/cluster-autoscaler/cloudprovider/azure/azure_scale_set.go
@@ -661,7 +661,7 @@ func (scaleSet *ScaleSet) TemplateNodeInfo() (*framework.NodeInfo, error) {
 		return nil, err
 	}
 
-	nodeInfo := framework.NewNodeInfo(node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(scaleSet.Name)})
+	nodeInfo := framework.NewNodeInfo(node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(scaleSet.Name), nil))
 	return nodeInfo, nil
 }
 
diff --git a/cluster-autoscaler/cloudprovider/azure/azure_vms_pool.go b/cluster-autoscaler/cloudprovider/azure/azure_vms_pool.go
@@ -482,7 +482,7 @@ func (vmPool *VMPool) TemplateNodeInfo() (*framework.NodeInfo, error) {
 		return nil, err
 	}
 
-	nodeInfo := framework.NewNodeInfo(node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(vmPool.agentPoolName)})
+	nodeInfo := framework.NewNodeInfo(node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(vmPool.agentPoolName), nil))
 
 	return nodeInfo, nil
 }
diff --git a/cluster-autoscaler/cloudprovider/baiducloud/baiducloud_cloud_provider.go b/cluster-autoscaler/cloudprovider/baiducloud/baiducloud_cloud_provider.go
@@ -386,7 +386,7 @@ func (asg *Asg) TemplateNodeInfo() (*framework.NodeInfo, error) {
 	if err != nil {
 		return nil, err
 	}
-	nodeInfo := framework.NewNodeInfo(node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(asg.Name)})
+	nodeInfo := framework.NewNodeInfo(node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(asg.Name), nil))
 	return nodeInfo, nil
 }
 
diff --git a/cluster-autoscaler/cloudprovider/brightbox/brightbox_node_group.go b/cluster-autoscaler/cloudprovider/brightbox/brightbox_node_group.go
@@ -274,7 +274,7 @@ func (ng *brightboxNodeGroup) TemplateNodeInfo() (*framework.NodeInfo, error) {
 			Conditions:  cloudprovider.BuildReadyConditions(),
 		},
 	}
-	nodeInfo := framework.NewNodeInfo(&node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(ng.Id())})
+	nodeInfo := framework.NewNodeInfo(&node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(ng.Id()), nil))
 	return nodeInfo, nil
 }
 
diff --git a/cluster-autoscaler/cloudprovider/brightbox/brightbox_node_group_test.go b/cluster-autoscaler/cloudprovider/brightbox/brightbox_node_group_test.go
@@ -316,7 +316,7 @@ func TestTemplateNodeInfo(t *testing.T) {
 		Return(fakeServerTypezx45f(), nil)
 	obj, err := makeFakeNodeGroup(t, testclient).TemplateNodeInfo()
 	require.NoError(t, err)
-	assert.Equal(t, fakeResource(), obj.ToScheduler().GetAllocatable())
+	assert.Equal(t, fakeResource(), obj.GetAllocatable())
 }
 
 func TestNodeGroupErrors(t *testing.T) {
diff --git a/cluster-autoscaler/cloudprovider/cherryservers/cherry_manager_rest.go b/cluster-autoscaler/cloudprovider/cherryservers/cherry_manager_rest.go
@@ -664,7 +664,7 @@ func (mgr *cherryManagerRest) templateNodeInfo(nodegroup string) (*framework.Nod
 	// GenericLabels
 	node.Labels = cloudprovider.JoinStringMaps(node.Labels, BuildGenericLabels(nodegroup, cherryPlan))
 
-	nodeInfo := framework.NewNodeInfo(&node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(nodegroup)})
+	nodeInfo := framework.NewNodeInfo(&node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(nodegroup), nil))
 	return nodeInfo, nil
 }
 
diff --git a/cluster-autoscaler/cloudprovider/civo/civo_node_group.go b/cluster-autoscaler/cloudprovider/civo/civo_node_group.go
@@ -219,7 +219,7 @@ func (n *NodeGroup) TemplateNodeInfo() (*framework.NodeInfo, error) {
 		return nil, fmt.Errorf("failed to build node from template")
 	}
 
-	nodeInfo := framework.NewNodeInfo(node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(n.Id())})
+	nodeInfo := framework.NewNodeInfo(node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(n.Id()), nil))
 	return nodeInfo, nil
 }
 
diff --git a/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_nodegroup.go b/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_nodegroup.go
@@ -382,7 +382,7 @@ func (ng *nodegroup) TemplateNodeInfo() (*framework.NodeInfo, error) {
 	}
 	csiNode := ng.scalableResource.InstanceCSINode()
 
-	nodeInfo := framework.NewNodeInfo(&node, resourceSlices, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(ng.scalableResource.Name())})
+	nodeInfo := framework.NewNodeInfo(&node, resourceSlices, framework.NewPodInfo(cloudprovider.BuildKubeProxy(ng.scalableResource.Name()), nil))
 	if csiNode != nil {
 		nodeInfo.SetCSINode(csiNode)
 	}
diff --git a/cluster-autoscaler/cloudprovider/equinixmetal/manager_rest.go b/cluster-autoscaler/cloudprovider/equinixmetal/manager_rest.go
@@ -716,7 +716,7 @@ func (mgr *equinixMetalManagerRest) templateNodeInfo(nodegroup string) (*framewo
 	// GenericLabels
 	node.Labels = cloudprovider.JoinStringMaps(node.Labels, BuildGenericLabels(nodegroup, mgr.getNodePoolDefinition(nodegroup).plan))
 
-	nodeInfo := framework.NewNodeInfo(&node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(nodegroup)})
+	nodeInfo := framework.NewNodeInfo(&node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(nodegroup), nil))
 	return nodeInfo, nil
 }
 
diff --git a/cluster-autoscaler/cloudprovider/gce/gce_cloud_provider.go b/cluster-autoscaler/cloudprovider/gce/gce_cloud_provider.go
@@ -383,7 +383,7 @@ func (mig *gceMig) TemplateNodeInfo() (*framework.NodeInfo, error) {
 	if err != nil {
 		return nil, err
 	}
-	nodeInfo := framework.NewNodeInfo(node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(mig.Id())})
+	nodeInfo := framework.NewNodeInfo(node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(mig.Id()), nil))
 	return nodeInfo, nil
 }
 
diff --git a/cluster-autoscaler/cloudprovider/hetzner/hetzner_node_group.go b/cluster-autoscaler/cloudprovider/hetzner/hetzner_node_group.go
@@ -305,7 +305,7 @@ func (n *hetznerNodeGroup) TemplateNodeInfo() (*framework.NodeInfo, error) {
 		}
 	}
 
-	nodeInfo := framework.NewNodeInfo(&node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(n.id)})
+	nodeInfo := framework.NewNodeInfo(&node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(n.id), nil))
 	return nodeInfo, nil
 }
 
diff --git a/cluster-autoscaler/cloudprovider/huaweicloud/huaweicloud_auto_scaling_group.go b/cluster-autoscaler/cloudprovider/huaweicloud/huaweicloud_auto_scaling_group.go
@@ -200,7 +200,7 @@ func (asg *AutoScalingGroup) TemplateNodeInfo() (*framework.NodeInfo, error) {
 	if err != nil {
 		return nil, err
 	}
-	nodeInfo := framework.NewNodeInfo(node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(asg.groupName)})
+	nodeInfo := framework.NewNodeInfo(node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(asg.groupName), nil))
 	return nodeInfo, nil
 }
 
diff --git a/cluster-autoscaler/cloudprovider/kamatera/kamatera_node_group.go b/cluster-autoscaler/cloudprovider/kamatera/kamatera_node_group.go
@@ -177,7 +177,7 @@ func (n *NodeGroup) TemplateNodeInfo() (*framework.NodeInfo, error) {
 	node.Status.Allocatable = node.Status.Capacity
 	node.Status.Conditions = cloudprovider.BuildReadyConditions()
 
-	nodeInfo := framework.NewNodeInfo(&node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(n.id)})
+	nodeInfo := framework.NewNodeInfo(&node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(n.id), nil))
 	return nodeInfo, nil
 }
 
diff --git a/cluster-autoscaler/cloudprovider/kwok/kwok_nodegroups.go b/cluster-autoscaler/cloudprovider/kwok/kwok_nodegroups.go
@@ -196,7 +196,7 @@ func (nodeGroup *NodeGroup) Nodes() ([]cloudprovider.Instance, error) {
 
 // TemplateNodeInfo returns a node template for this node group.
 func (nodeGroup *NodeGroup) TemplateNodeInfo() (*framework.NodeInfo, error) {
-	nodeInfo := framework.NewNodeInfo(nodeGroup.nodeTemplate, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(nodeGroup.Id())})
+	nodeInfo := framework.NewNodeInfo(nodeGroup.nodeTemplate, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(nodeGroup.Id()), nil))
 	return nodeInfo, nil
 }
 
diff --git a/cluster-autoscaler/cloudprovider/magnum/magnum_nodegroup.go b/cluster-autoscaler/cloudprovider/magnum/magnum_nodegroup.go
@@ -230,7 +230,7 @@ func (ng *magnumNodeGroup) TemplateNodeInfo() (*framework.NodeInfo, error) {
 		return nil, fmt.Errorf("failed to build node from template")
 	}
 	klog.V(5).Infof("TemplateNodeInfo: built template for nodegroup: %s", ng.Id())
-	nodeInfo := framework.NewNodeInfo(node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(ng.Id())})
+	nodeInfo := framework.NewNodeInfo(node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(ng.Id()), nil))
 
 	return nodeInfo, nil
 }
diff --git a/cluster-autoscaler/cloudprovider/oci/instancepools/oci_instance_pool.go b/cluster-autoscaler/cloudprovider/oci/instancepools/oci_instance_pool.go
@@ -192,8 +192,8 @@ func (ip *InstancePoolNodeGroup) TemplateNodeInfo() (*framework.NodeInfo, error)
 
 	nodeInfo := framework.NewNodeInfo(
 		node, nil,
-		&framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(ip.id)},
-		&framework.PodInfo{Pod: ocicommon.BuildCSINodePod()},
+		framework.NewPodInfo(cloudprovider.BuildKubeProxy(ip.id), nil),
+		framework.NewPodInfo(ocicommon.BuildCSINodePod(), nil),
 	)
 	return nodeInfo, nil
 }
diff --git a/cluster-autoscaler/cloudprovider/oci/nodepools/oci_node_pool.go b/cluster-autoscaler/cloudprovider/oci/nodepools/oci_node_pool.go
@@ -307,9 +307,9 @@ func (np *nodePool) TemplateNodeInfo() (*framework.NodeInfo, error) {
 
 	nodeInfo := framework.NewNodeInfo(
 		node, nil,
-		&framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(np.id)},
-		&framework.PodInfo{Pod: ocicommon.BuildFlannelPod()},
-		&framework.PodInfo{Pod: ocicommon.BuildProxymuxClientPod()},
+		framework.NewPodInfo(cloudprovider.BuildKubeProxy(np.id), nil),
+		framework.NewPodInfo(ocicommon.BuildFlannelPod(), nil),
+		framework.NewPodInfo(ocicommon.BuildProxymuxClientPod(), nil),
 	)
 	return nodeInfo, nil
 }
diff --git a/cluster-autoscaler/cloudprovider/ovhcloud/ovh_cloud_node_group.go b/cluster-autoscaler/cloudprovider/ovhcloud/ovh_cloud_node_group.go
@@ -257,7 +257,7 @@ func (ng *NodeGroup) TemplateNodeInfo() (*framework.NodeInfo, error) {
 	node.Status.Allocatable = node.Status.Capacity
 
 	// Setup node info template
-	nodeInfo := framework.NewNodeInfo(node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(ng.Id())})
+	nodeInfo := framework.NewNodeInfo(node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(ng.Id()), nil))
 	return nodeInfo, nil
 }
 
diff --git a/cluster-autoscaler/cloudprovider/rancher/rancher_nodegroup.go b/cluster-autoscaler/cloudprovider/rancher/rancher_nodegroup.go
@@ -221,7 +221,7 @@ func (ng *nodeGroup) TemplateNodeInfo() (*framework.NodeInfo, error) {
 	node.Status.Allocatable = node.Status.Capacity
 
 	// Setup node info template
-	nodeInfo := framework.NewNodeInfo(node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(ng.Id())})
+	nodeInfo := framework.NewNodeInfo(node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(ng.Id()), nil))
 	return nodeInfo, nil
 }
 
diff --git a/cluster-autoscaler/cloudprovider/rancher/rancher_nodegroup_test.go b/cluster-autoscaler/cloudprovider/rancher/rancher_nodegroup_test.go
@@ -396,19 +396,19 @@ func TestTemplateNodeInfo(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if nodeInfo.ToScheduler().GetAllocatable().GetMilliCPU() != ng.resources.Cpu().MilliValue() {
+	if nodeInfo.GetAllocatable().GetMilliCPU() != ng.resources.Cpu().MilliValue() {
 		t.Fatalf("expected nodeInfo to have %v MilliCPU, got %v",
-			ng.resources.Cpu().MilliValue(), nodeInfo.ToScheduler().GetAllocatable().GetMilliCPU())
+			ng.resources.Cpu().MilliValue(), nodeInfo.GetAllocatable().GetMilliCPU())
 	}
 
-	if nodeInfo.ToScheduler().GetAllocatable().GetMemory() != ng.resources.Memory().Value() {
+	if nodeInfo.GetAllocatable().GetMemory() != ng.resources.Memory().Value() {
 		t.Fatalf("expected nodeInfo to have %v Memory, got %v",
-			ng.resources.Memory().Value(), nodeInfo.ToScheduler().GetAllocatable().GetMemory())
+			ng.resources.Memory().Value(), nodeInfo.GetAllocatable().GetMemory())
 	}
 
-	if nodeInfo.ToScheduler().GetAllocatable().GetEphemeralStorage() != ng.resources.StorageEphemeral().Value() {
+	if nodeInfo.GetAllocatable().GetEphemeralStorage() != ng.resources.StorageEphemeral().Value() {
 		t.Fatalf("expected nodeInfo to have %v ephemeral storage, got %v",
-			ng.resources.StorageEphemeral().Value(), nodeInfo.ToScheduler().GetAllocatable().GetEphemeralStorage())
+			ng.resources.StorageEphemeral().Value(), nodeInfo.GetAllocatable().GetEphemeralStorage())
 	}
 }
 
diff --git a/cluster-autoscaler/cloudprovider/scaleway/scaleway_node_group.go b/cluster-autoscaler/cloudprovider/scaleway/scaleway_node_group.go
@@ -227,7 +227,7 @@ func (ng *NodeGroup) TemplateNodeInfo() (*framework.NodeInfo, error) {
 	node.Status.Conditions = cloudprovider.BuildReadyConditions()
 	node.Spec.Taints = parseTaints(ng.pool.Taints)
 
-	nodeInfo := framework.NewNodeInfo(&node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(ng.pool.Name)})
+	nodeInfo := framework.NewNodeInfo(&node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(ng.pool.Name), nil))
 
 	return nodeInfo, nil
 }
diff --git a/cluster-autoscaler/cloudprovider/utho/utho_node_group.go b/cluster-autoscaler/cloudprovider/utho/utho_node_group.go
@@ -334,7 +334,7 @@ func (n *NodeGroup) TemplateNodeInfo() (*framework.NodeInfo, error) {
 	node.Status.Conditions = readyConditions()
 
 	// Wrap in NodeInfo, add kube-proxy pod
-	ni := framework.NewNodeInfo(node, nil, &framework.PodInfo{Pod: buildKubeProxy(n.id)})
+	ni := framework.NewNodeInfo(node, nil, framework.NewPodInfo(buildKubeProxy(n.id), nil))
 	klog.V(4).Infof("TemplateNodeInfo: completed for node-group %s, returning NodeInfo", n.id)
 	return ni, nil
 }
diff --git a/cluster-autoscaler/cloudprovider/volcengine/volcengine_auto_scaling_group.go b/cluster-autoscaler/cloudprovider/volcengine/volcengine_auto_scaling_group.go
@@ -189,7 +189,7 @@ func (asg *AutoScalingGroup) TemplateNodeInfo() (*framework.NodeInfo, error) {
 	if err != nil {
 		return nil, err
 	}
-	nodeInfo := framework.NewNodeInfo(node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(asg.asgId)})
+	nodeInfo := framework.NewNodeInfo(node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(asg.asgId), nil))
 	return nodeInfo, nil
 }
 
diff --git a/cluster-autoscaler/utils/daemonset/daemonset.go b/cluster-autoscaler/utils/daemonset/daemonset.go
@@ -48,7 +48,7 @@ func GetDaemonSetPodsForNode(nodeInfo *framework.NodeInfo, daemonsets []*appsv1.
 			pod.ObjectMeta.OwnerReferences = []metav1.OwnerReference{
 				{Kind: "DaemonSet", UID: ds.UID, Name: ds.Name, Controller: &ptrVal},
 			}
-			result = append(result, &framework.PodInfo{Pod: pod})
+			result = append(result, framework.NewPodInfo(pod, nil))
 		}
 	}
 	return result, nil
diff --git a/cluster-autoscaler/utils/scheduler/scheduler.go b/cluster-autoscaler/utils/scheduler/scheduler.go
@@ -50,7 +50,7 @@ func CreateNodeNameToInfoMap(pods []*apiv1.Pod, nodes []*apiv1.Node) map[string]
 		if _, ok := nodeNameToNodeInfo[nodeName]; !ok {
 			nodeNameToNodeInfo[nodeName] = framework.NewNodeInfo(nil, nil)
 		}
-		nodeNameToNodeInfo[nodeName].AddPod(&framework.PodInfo{Pod: pod})
+		nodeNameToNodeInfo[nodeName].AddPod(framework.NewPodInfo(pod, nil))
 	}
 
 	for _, node := range nodes {

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ func (asg Asg) TemplateNodeInfo() (framework.NodeInfo, error) {`
`196`	`196`	`return nil, err`
`197`	`197`	`}`
`198`	`198`
`199`		`- nodeInfo := framework.NewNodeInfo(node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(asg.id)})`
	`199`	`+ nodeInfo := framework.NewNodeInfo(node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(asg.id), nil))`
`200`	`200`	`return nodeInfo, nil`
`201`	`201`	`}`
`202`	`202`
Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ func (ng AwsNodeGroup) TemplateNodeInfo() (framework.NodeInfo, error) {`
`411`	`411`	`return nil, err`
`412`	`412`	`}`
`413`	`413`
`414`		`- nodeInfo := framework.NewNodeInfo(node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(ng.asg.Name)})`
	`414`	`+ nodeInfo := framework.NewNodeInfo(node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(ng.asg.Name), nil))`
`415`	`415`	`return nodeInfo, nil`
`416`	`416`	`}`
`417`	`417`
Original file line number	Diff line number	Diff line change
`@@ -661,7 +661,7 @@ func (scaleSet ScaleSet) TemplateNodeInfo() (framework.NodeInfo, error) {`
`661`	`661`	`return nil, err`
`662`	`662`	`}`
`663`	`663`
`664`		`- nodeInfo := framework.NewNodeInfo(node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(scaleSet.Name)})`
	`664`	`+ nodeInfo := framework.NewNodeInfo(node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(scaleSet.Name), nil))`
`665`	`665`	`return nodeInfo, nil`
`666`	`666`	`}`
`667`	`667`
Original file line number	Diff line number	Diff line change
`@@ -482,7 +482,7 @@ func (vmPool VMPool) TemplateNodeInfo() (framework.NodeInfo, error) {`
`482`	`482`	`return nil, err`
`483`	`483`	`}`
`484`	`484`
`485`		`- nodeInfo := framework.NewNodeInfo(node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(vmPool.agentPoolName)})`
	`485`	`+ nodeInfo := framework.NewNodeInfo(node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(vmPool.agentPoolName), nil))`
`486`	`486`
`487`	`487`	`return nodeInfo, nil`
`488`	`488`	`}`
Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ func (asg Asg) TemplateNodeInfo() (framework.NodeInfo, error) {`
`386`	`386`	`if err != nil {`
`387`	`387`	`return nil, err`
`388`	`388`	`}`
`389`		`- nodeInfo := framework.NewNodeInfo(node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(asg.Name)})`
	`389`	`+ nodeInfo := framework.NewNodeInfo(node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(asg.Name), nil))`
`390`	`390`	`return nodeInfo, nil`
`391`	`391`	`}`
`392`	`392`
Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ func (ng brightboxNodeGroup) TemplateNodeInfo() (framework.NodeInfo, error) {`
`274`	`274`	`Conditions: cloudprovider.BuildReadyConditions(),`
`275`	`275`	`},`
`276`	`276`	`}`
`277`		`- nodeInfo := framework.NewNodeInfo(&node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(ng.Id())})`
	`277`	`+ nodeInfo := framework.NewNodeInfo(&node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(ng.Id()), nil))`
`278`	`278`	`return nodeInfo, nil`
`279`	`279`	`}`
`280`	`280`
Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ func TestTemplateNodeInfo(t *testing.T) {`
`316`	`316`	`Return(fakeServerTypezx45f(), nil)`
`317`	`317`	`obj, err := makeFakeNodeGroup(t, testclient).TemplateNodeInfo()`
`318`	`318`	`require.NoError(t, err)`
`319`		`- assert.Equal(t, fakeResource(), obj.ToScheduler().GetAllocatable())`
	`319`	`+ assert.Equal(t, fakeResource(), obj.GetAllocatable())`
`320`	`320`	`}`
`321`	`321`
`322`	`322`	`func TestNodeGroupErrors(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,7 @@ func (mgr cherryManagerRest) templateNodeInfo(nodegroup string) (framework.Nod`
`664`	`664`	`// GenericLabels`
`665`	`665`	`node.Labels = cloudprovider.JoinStringMaps(node.Labels, BuildGenericLabels(nodegroup, cherryPlan))`
`666`	`666`
`667`		`- nodeInfo := framework.NewNodeInfo(&node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(nodegroup)})`
	`667`	`+ nodeInfo := framework.NewNodeInfo(&node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(nodegroup), nil))`
`668`	`668`	`return nodeInfo, nil`
`669`	`669`	`}`
`670`	`670`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ func (n NodeGroup) TemplateNodeInfo() (framework.NodeInfo, error) {`
`219`	`219`	`return nil, fmt.Errorf("failed to build node from template")`
`220`	`220`	`}`
`221`	`221`
`222`		`- nodeInfo := framework.NewNodeInfo(node, nil, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(n.Id())})`
	`222`	`+ nodeInfo := framework.NewNodeInfo(node, nil, framework.NewPodInfo(cloudprovider.BuildKubeProxy(n.Id()), nil))`
`223`	`223`	`return nodeInfo, nil`
`224`	`224`	`}`
`225`	`225`
Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ func (ng nodegroup) TemplateNodeInfo() (framework.NodeInfo, error) {`
`382`	`382`	`}`
`383`	`383`	`csiNode := ng.scalableResource.InstanceCSINode()`
`384`	`384`
`385`		`- nodeInfo := framework.NewNodeInfo(&node, resourceSlices, &framework.PodInfo{Pod: cloudprovider.BuildKubeProxy(ng.scalableResource.Name())})`
	`385`	`+ nodeInfo := framework.NewNodeInfo(&node, resourceSlices, framework.NewPodInfo(cloudprovider.BuildKubeProxy(ng.scalableResource.Name()), nil))`
`386`	`386`	`if csiNode != nil {`
`387`	`387`	`nodeInfo.SetCSINode(csiNode)`
`388`	`388`	`}`