ControllerRefManager: Don't always filter inactive Pods.

Some controllers, like DaemonSet, want to see all Pods.
This commit is contained in:
Anthony Yeh
2017-02-25 12:39:49 -08:00
parent db6665251a
commit 01d025a7cc
3 changed files with 21 additions and 14 deletions

View File

@@ -163,11 +163,6 @@ func (m *PodControllerRefManager) ClaimPods(pods []*v1.Pod) ([]*v1.Pod, error) {
}
for _, pod := range pods {
if !IsPodActive(pod) {
glog.V(4).Infof("Ignoring inactive pod %v/%v in state %v, deletion time %v",
pod.Namespace, pod.Name, pod.Status.Phase, pod.DeletionTimestamp)
continue
}
ok, err := m.claimObject(pod, adopt, release)
if err != nil {
errlist = append(errlist, err)