Remove missing extended resources from init containers

[panoswoo]

What type of PR is this?

/kind bug

What this PR does / why we need it:

The function removeMissingExtendedResources() located at pkg/kubelet/lifecycle/predicate.go:217, is designed to remove any extended resources from a container’s requests that are not found in nodeInfo.Allocatable before the pod is admitted.
This is necessary to support cluster-level resources, which are extended resources that are unknown to nodes.
However, this function only removes missingExtendedResources from the container’s requests, and does not process the requests of initContainers.
This could lead to issues, as initContainers might request resources that do not exist on the node, which could result in the pod failing to be admitted or other unforeseen issues.

Which issue(s) this PR fixes:

Fixes #124255

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

[k8s-ci-robot]

Please note that we're already in Test Freeze for the release-1.30 branch. This means every merged PR will be automatically fast-forwarded via the periodic ci-fast-forward job to the release branch of the upcoming v1.30.0 release.

Fast forwards are scheduled to happen every 6 hours, whereas the most recent run was: Thu Apr 11 13:45:22 UTC 2024.

[linux-foundation-easycla]

The committers listed above are authorized under a signed CLA.

• ✅ login: panoswoo / name: Panos Woo (fbb975b)

[k8s-ci-robot]

Welcome @panoswoo!

It looks like this is your first PR to kubernetes/kubernetes 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/kubernetes has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

[k8s-ci-robot]

Hi @panoswoo. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: panoswoo
Once this PR has been reviewed and has the lgtm label, please assign yujuhong for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

• pkg/kubelet/OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[haircommander]

/ok-to-test
/triage accepted
/priority important-longterm

LGTM, let's see how tests feel but this seems like a straight forward fix

[panoswoo]

/ok-to-test

/triage accepted

/priority important-longterm

LGTM, let's see how tests feel but this seems like a straight forward fix

Tests are all good, lgtm plz :)

[bart0sh]

This code looks almost identical to the code above. Would it be possible to avoid duplication somehow?

[panoswoo]

I’ll extract the duplicate code into a new function. Should I add this code to a new commit or just amend the existing one?

[fulviodenza]

I would propose this to not replicate the code:

func removeMissingExtendedResources(pod *v1.Pod, nodeInfo *schedulerframework.NodeInfo) *v1.Pod {
	podCopy := pod.DeepCopy()
	updateResourceRequests := func(containers []v1.Container) []v1.Container {
		for i, container := range containers {
			// We only handle requests in Requests but not Limits because the
			// PodFitsResources predicate, to which the result pod will be passed,
			// does not use Limits.
			container.Resources.Requests = filterExtendedResources(container.Resources.Requests, nodeInfo)
			containers[i] = container
		}
		return containers
	}

	podCopy.Spec.Containers = updateResourceRequests(podCopy.Spec.Containers)
	podCopy.Spec.InitContainers = updateResourceRequests(podCopy.Spec.InitContainers)

	return podCopy
}

func filterExtendedResources(requests v1.ResourceList, nodeInfo *schedulerframework.NodeInfo) v1.ResourceList {
	filteredRequests := make(v1.ResourceList)
	for rName, rQuant := range requests {
		if v1helper.IsExtendedResourceName(rName) {
			if _, found := nodeInfo.Allocatable.ScalarResources[rName]; !found {
				continue
			}
		}
		filteredRequests[rName] = rQuant
	}
	return filteredRequests
}

[panoswoo]

nice suggestion, I plan to modify it like this:

func removeMissingExtendedResources(pod *v1.Pod, nodeInfo *schedulerframework.NodeInfo) *v1.Pod {
	filterExtendedResources := func(containers []v1.Container) {
		for i, c := range containers {
			// We only handle requests in Requests but not Limits because the
			// PodFitsResources predicate, to which the result pod will be passed,
			// does not use Limits.
			filteredResources := make(v1.ResourceList)
			for rName, rQuant := range c.Resources.Requests {
				if v1helper.IsExtendedResourceName(rName) {
					if _, found := nodeInfo.Allocatable.ScalarResources[rName]; !found {
						continue
					}
				}
				filteredResources[rName] = rQuant
			}
			containers[i].Resources.Requests = filteredResources
		}
	}
	podCopy := pod.DeepCopy()
	filterExtendedResources(podCopy.Spec.Containers)
	filterExtendedResources(podCopy.Spec.InitContainers)
	return podCopy
}

[bart0sh]

/lgtm

[panoswoo]

/retest

[k8s-ci-robot]

LGTM label has been added.

Git tree hash: 68528a8c71c17b3502aadcfec4c0a89f975e0ec8

[bart0sh]

/assign @mrunalp @derekwaynecarr @dchen1107
for approval

[panoswoo]

@mrunalp @derekwaynecarr @dchen1107 PTAL~