Commit f35ae09

openshift-merge-robot

authored

Merge pull request #16244 from sjenning/pick-51644

Automatic merge from submit-queue (batch tested with PRs 15725, 16244, 15796, 16328, 16334) UPSTREAM: 51644: do not update init containers status if terminated kubernetes/kubernetes#51644 xref https://bugzilla.redhat.com/show_bug.cgi?id=1486356 @derekwaynecarr @bparees

2 parents 682fd1b + 1801d41 commit f35ae09Copy full SHA for f35ae09

1 file changed

+11

-4

lines changed

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

1 file changed

+11

-4

lines changed

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

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Comments

(0)