github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #113718 from mimowo/handling-pod-failures-kubelet-nits

Browse Source 
Add comments to clarify the updated logic in kubelet's status_manager
This commit is contained in:
Kubernetes Prow Robot 2022-11-08 10:38:51 -08:00 committed by GitHub
commit c40d961324
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubelet/status/status_manager.go
View File

@ -894,12 +894,16 @@ func mergePodStatus(oldPodStatus, newPodStatus v1.PodStatus, couldHaveRunningCon
if kubetypes.PodConditionByKubelet(c.Type) { if kubetypes.PodConditionByKubelet(c.Type) {
podConditions = append(podConditions, c) podConditions = append(podConditions, c)
} else if kubetypes.PodConditionSharedByKubelet(c.Type) { } else if kubetypes.PodConditionSharedByKubelet(c.Type) {
// we replace or append all the "shared by kubelet" conditions
if c.Type == v1.AlphaNoCompatGuaranteeDisruptionTarget { if c.Type == v1.AlphaNoCompatGuaranteeDisruptionTarget {
// update the pod disruption condition only if transitioning to terminal phase. In particular, check if // guard the update of the DisruptionTarget condition with a check to ensure
// there might still be running containers to avoid sending an unnecessary PATCH request if the // it will only be sent once all containers have terminated and the phase
// actual transition is delayed (see below) // is terminal. This avoids sending an unnecessary patch request to add
// the condition if the actual status phase transition is delayed.
if transitioningToTerminalPhase && !couldHaveRunningContainers { if transitioningToTerminalPhase && !couldHaveRunningContainers {
// update the LastTransitionTime // update the LastTransitionTime again here because the older transition
// time set in updateStatusInternal is likely stale as sending of
// the condition was delayed until all pod's containers have terminated.
updateLastTransitionTime(&newPodStatus, &oldPodStatus, c.Type) updateLastTransitionTime(&newPodStatus, &oldPodStatus, c.Type)
if _, c := podutil.GetPodConditionFromList(newPodStatus.Conditions, c.Type); c != nil { if _, c := podutil.GetPodConditionFromList(newPodStatus.Conditions, c.Type); c != nil {
// for shared conditions we update or append in podConditions // for shared conditions we update or append in podConditions