Commit 81f1117

openshift-merge-robot

authored

Merge pull request #19580 from sjenning/pick-63321

UPSTREAM: 63321: kubelet: force filterContainerID to empty string when removeAll is true

2 parents b93118a + 72207b6 commit 81f1117Copy full SHA for 81f1117

2 files changed

+6

-1

lines changed

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

2 files changed

+6

-1

lines changed

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

+5-1

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

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

+1

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

Comments

(0)