Fix up after rebasing on top of dedup pod resource req calculation PR

CHANGELOG/CHANGELOG-1.27.md

@@ -153,7 +153,7 @@ name | architectures
 - PodSpec.Container.Resources becomes mutable for CPU and memory resource types.
   - PodSpec.Container.ResizePolicy (new object) gives users control over how their containers are resized.
   - PodStatus.Resize status describes the state of a requested Pod resize.
-  - PodStatus.ResourcesAllocated describes node resources allocated to Pod.
+  - PodStatus.AllocatedResources describes node resources allocated to Pod.
   - PodStatus.Resources describes node resources applied to running containers by CRI.
   - UpdateContainerResources CRI API now supports both Linux and Windows.
   

pkg/api/v1/resource/helpers.go

@@ -65,9 +65,9 @@ func PodRequests(pod *v1.Pod, opts PodResourcesOptions) v1.ResourceList {
 			cs, found := containerStatuses[container.Name]
 			if found {
 				if pod.Status.Resize == v1.PodResizeStatusInfeasible {
-					containerReqs = cs.ResourcesAllocated
+					containerReqs = cs.AllocatedResources
 				} else {
-					containerReqs = max(container.Resources.Requests, cs.ResourcesAllocated)
+					containerReqs = max(container.Resources.Requests, cs.AllocatedResources)
 				}
 			}
 		}

pkg/api/v1/resource/helpers_test.go

@@ -737,7 +737,7 @@ func TestPodResourceRequests(t *testing.T) {
 			containerStatus: []v1.ContainerStatus{
 				{
 					Name: "container-1",
-					ResourcesAllocated: v1.ResourceList{
+					AllocatedResources: v1.ResourceList{
 						v1.ResourceCPU: resource.MustParse("2"),
 					},
 				},
@@ -762,7 +762,7 @@ func TestPodResourceRequests(t *testing.T) {
 			containerStatus: []v1.ContainerStatus{
 				{
 					Name: "container-1",
-					ResourcesAllocated: v1.ResourceList{
+					AllocatedResources: v1.ResourceList{
 						v1.ResourceCPU: resource.MustParse("2"),
 					},
 				},
@@ -788,7 +788,7 @@ func TestPodResourceRequests(t *testing.T) {
 			containerStatus: []v1.ContainerStatus{
 				{
 					Name: "container-1",
-					ResourcesAllocated: v1.ResourceList{
+					AllocatedResources: v1.ResourceList{
 						v1.ResourceCPU: resource.MustParse("2"),
 					},
 				},