diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go index b1d286fde539..e0fef3c95b5c 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go @@ -1315,10 +1315,17 @@ func (kl *Kubelet) convertToAPIContainerStatuses(pod *v1.Pod, podStatus *kubecon Image: container.Image, State: defaultWaitingState, } - // Apply some values from the old statuses as the default values. - if oldStatus, found := oldStatuses[container.Name]; found { - status.RestartCount = oldStatus.RestartCount - status.LastTerminationState = oldStatus.LastTerminationState + oldStatus, found := oldStatuses[container.Name] + if found { + if isInitContainer && oldStatus.State.Terminated != nil { + // 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 }