github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not update init containers status if terminated

Browse Source
This commit is contained in:
Seth Jennings 2017-08-30 13:55:17 -04:00
parent 0ade03bc0f
commit 3b80b9d518
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/kubelet/kubelet_pods.go
View File

@ -1329,10 +1329,17 @@ func (kl *Kubelet) convertToAPIContainerStatuses(pod *v1.Pod, podStatus *kubecon
Image: container.Image, Image: container.Image,
State: defaultWaitingState, State: defaultWaitingState,
} }
// Apply some values from the old statuses as the default values. oldStatus, found := oldStatuses[container.Name]
if oldStatus, found := oldStatuses[container.Name]; found { if found {
status.RestartCount = oldStatus.RestartCount if isInitContainer && oldStatus.State.Terminated != nil {
status.LastTerminationState = oldStatus.LastTerminationState // Do not update status on terminated init containers as
// they be removed at any time.
status = &oldStatus
} else {
// Apply some values from the old statuses as the default values.
status.RestartCount = oldStatus.RestartCount
status.LastTerminationState = oldStatus.LastTerminationState
}
} }
statuses[container.Name] = status statuses[container.Name] = status
} }