Skip to content

Commit

Permalink
UPSTREAM: <carry>: Fix logging when orphan pods are found in cleanupO…
Browse files Browse the repository at this point in the history
…rphanedPodDirs

This is basically a cherry-pick of:

1. kubernetes/kubernetes#38909
2. https://github.com/kubernetes/kubernetes/pull/41626/files

But those commits can't be directly cherry picked because of whole
lot of dependencies.

Fixes openshift#13111
  • Loading branch information
gnufied committed Mar 28, 2017
1 parent 977f53a commit f56239f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
8 changes: 8 additions & 0 deletions vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_getters.go

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

10 changes: 8 additions & 2 deletions vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_volumes.go

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

0 comments on commit f56239f

Please sign in to comment.