Skip to content

Commit dbb1013

Browse files
openshift-merge-robotopenshift-merge-robot
authored
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
2 parents 64bad7b + 644ea9d commit dbb1013

File tree

5 files changed

+85
-63
lines changed

5 files changed

+85
-63
lines changed

‎vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/fake_kuberuntime_manager.go

Lines changed: 15 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/kuberuntime_gc.go

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)