Merge pull request #840 from googs1025/fix_calculating_pod_requests

fix(util): fix the problem of pod overhead not being calculated

Author: k8s-ci-robot

pkg/util/resource.go

@@ -47,6 +47,7 @@ func ResourceList(r *framework.Resource) v1.ResourceList {
 // - the sum of all app containers(spec.Containers) request for a resource.
 // - the effective init containers(spec.InitContainers) request for a resource.
 // The effective init containers request is the highest request on all init containers.
+// Additionally, if the Pod specifies overhead, it will also be included in the final calculation.
 func GetPodEffectiveRequest(pod *v1.Pod) v1.ResourceList {
 	initResources := make(v1.ResourceList)
 	resources := make(v1.ResourceList)
@@ -73,5 +74,12 @@ func GetPodEffectiveRequest(pod *v1.Pod) v1.ResourceList {
 		}
 		resources[name] = quantity
 	}
+	// Add pod overhead if present
+	for name, quantity := range pod.Spec.Overhead {
+		if q, ok := resources[name]; ok {
+			quantity.Add(q)
+		}
+		resources[name] = quantity
+	}
 	return resources
 }

pkg/util/resource_test.go

@@ -36,6 +36,7 @@ func TestGetPodEffectiveRequest(t *testing.T) {
 		name                 string
 		containerRequest     []v1.ResourceList
 		initContainerRequest []v1.ResourceList
+		podOverheadRequest   v1.ResourceList
 		want                 v1.ResourceList
 	}{
 		{
@@ -101,6 +102,27 @@ func TestGetPodEffectiveRequest(t *testing.T) {
 			},
 			want: makeResourceList(10, 4),
 		},
+		{
+			name: "1 container with pod overhead",
+			containerRequest: []v1.ResourceList{
+				makeResourceList(1, 1),
+			},
+			initContainerRequest: nil,
+			podOverheadRequest:   makeResourceList(1, 1),
+			want:                 makeResourceList(2, 2),
+		},
+		{
+			name: "2 containers and 1 init container with pod overhead",
+			containerRequest: []v1.ResourceList{
+				makeResourceList(1, 1),
+				makeResourceList(2, 3),
+			},
+			initContainerRequest: []v1.ResourceList{
+				makeResourceList(1, 1),
+			},
+			podOverheadRequest: makeResourceList(1, 1),
+			want:               makeResourceList(4, 5),
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -119,6 +141,7 @@ func TestGetPodEffectiveRequest(t *testing.T) {
 					},
 				})
 			}
+			pod.Spec.Overhead = tt.podOverheadRequest
 			if got := GetPodEffectiveRequest(pod); !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("GetPodEffectiveRequest() = %v, want %v", got, tt.want)
 			}