This repository was archived by the owner on Apr 20, 2026. It is now read-only.
COMPUTE-5948: Add Lyft patches on top of 1.23.17#39
Merged
abhinavdahiya merged 15 commits intorelease-1.23.17-lyft.1from Jun 26, 2023
Merged
COMPUTE-5948: Add Lyft patches on top of 1.23.17#39abhinavdahiya merged 15 commits intorelease-1.23.17-lyft.1from
abhinavdahiya merged 15 commits intorelease-1.23.17-lyft.1from
Conversation
This change turns off the ability to completely kill pods when the non-sidecars are done. This is useful for cronjobs, where the non-sidecars finish work and exit, this code previously would clean up the pod and its resources. This feature was pulled in from kubernetes#75099. This is a feature that sounds nice in practice, but its not what we need. It seems to be a bit buggy since the Pod sandbox can potentially be deleted and recreated during the liftime of the Pod. That ain't good.
CRI-O properly implements the CRI interface, and therefore it is capable of returning the container stats if being asked for. There is no reason to keep CRI-O as a special use case that has to be run with the legacy mode making kubelet using cadvisor on each container. This patch removes the hardcoded assumptions that CRI-O has cannot handle to return containers stats through CRI. Fixes kubernetes#73750 Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
We're not guaranteed that the pod passed in has the ContainerSpec we're looking for. With this, we check if the pod has the container spec, and if it doesn't, we try to recover it one more time.
…ceeds 18446744073
abhinavdahiya
force-pushed
the
custom-patch
branch
from
8b84255 to
09dbaa4
Compare
abhinavdahiya
changed the title
Author
this is still needed as upstream behavior has not changed https://github.com/kubernetes/kubernetes/blob/release-1.23/pkg/kubelet/cadvisor/util.go#L76
this is still needed as the upstream issue is still open kubernetes#94825
this is still needed as we will migrate to EBS CSI driver after updating the kubelet to 1.23, so in 1.24 this can be removed. |
abhinavdahiya
changed the base branch from
release-1.23.17
to
release-1.23.17-lyft.1
Based on the api documentation https://pkg.go.dev/k8s.io/api/core/v1#ContainerState ``` ContainerState holds a possible state of container. Only one of its members may be specified. If none of them is specified, the default one is ContainerStateWaiting. ``` There is a case where no explicit state is known for a container and it must be treated as waiting state. So we must check for nil value (since the State is a value and pointer we have to check that all possible fields are nil , :( ) and treat it as Waiting state. Also fixes the `Restart running non-sidecars despite sidecar becoming not ready` test. A pod if needs to be restarted (i.e it had existed and has run at least one) the state of the container should be set to last running state. compare to zero value
…atus is not available (#37) 1. When all container statuses are nil, we should default to application containers wait untill statuses are available 2. When application container is nil, we should default to application containers waiting state
…nt (#40) based on https://lyft.slack.com/archives/C017X524VC7/p1685639606706689?thread_ts=1685481685.730389&cid=C017X524VC7 when there are no sidecars we should allow all containers to start even when there is lack of container status. This fixes a regression introduced in #37 where we would block starting containers until we get container status reported. this triggers KillPod action in 1.16 as no progress can be made. --------- Co-authored-by: Tom Wanielista <tomwans@users.noreply.github.com>
abhinavdahiya
force-pushed
the
custom-patch
branch
2 times, most recently
from
acb04ad to
0481e2b
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
|
| * 2dccc3d - compare to zero value (8 weeks ago)
| * f7be970 - handle case where there is no known container state (8 weeks ago)
|/
using cherry-pick