Remove missing extended resources from init containers

Signed-off-by: Panos Woo <panoswoo@outlook.com>
kubernetes · Apr 11, 2024 · 475c670 · 475c670
1 parent 9791f0d
commit 475c670
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/pkg/kubelet/lifecycle/predicate.go b/pkg/kubelet/lifecycle/predicate.go
@@ -230,6 +230,17 @@ func removeMissingExtendedResources(pod *v1.Pod, nodeInfo *schedulerframework.No
 			podCopy.Spec.Containers[i].Resources.Requests[rName] = rQuant
 		}
 	}
+	for i, c := range pod.Spec.InitContainers {
+		podCopy.Spec.InitContainers[i].Resources.Requests = make(v1.ResourceList)
+		for rName, rQuant := range c.Resources.Requests {
+			if v1helper.IsExtendedResourceName(rName) {
+				if _, found := nodeInfo.Allocatable.ScalarResources[rName]; !found {
+					continue
+				}
+			}
+			podCopy.Spec.InitContainers[i].Resources.Requests[rName] = rQuant
+		}
+	}
 	return podCopy
 }
 

diff --git a/pkg/kubelet/lifecycle/predicate_test.go b/pkg/kubelet/lifecycle/predicate_test.go
@@ -106,6 +106,14 @@ func makeTestPod(requests, limits v1.ResourceList) *v1.Pod {
 					},
 				},
 			},
+			InitContainers: []v1.Container{
+				{
+					Resources: v1.ResourceRequirements{
+						Requests: requests,
+						Limits:   limits,
+					},
+				},
+			},
 		},
 	}
 }