Merge pull request #16896 from sjenning/pick-53167

Automatic merge from submit-queue (batch tested with PRs 16896, 16908, 16935, 16898, 16090). UPSTREAM: 53167: Do not GC exited containers in running pods kubernetes/kubernetes#53167 xref https://bugzilla.redhat.com/show_bug.cgi?id=1486356 I think this might fix the build issues we are having with init container status corruption Thanks to @aveshagarwal for spotting this getting picked to kube 1.7 👍 @frobware @derekwaynecarr @smarterclayton @vikaslaad
openshift · Oct 20, 2017 · dbb1013 · dbb1013
2 parents 64bad7b + 644ea9d
commit dbb1013
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 63 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/fake_kuberuntime_manager.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/fake_kuberuntime_manager.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/kuberuntime_gc.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/kuberuntime_gc.go