Merge pull request kubernetes#3806 from jbartosik/revert-3744

Revert 3744

vertical-pod-autoscaler/pkg/recommender/input/cluster_feeder.go

@@ -185,11 +185,11 @@ func newPodClients(kubeClient kube_client.Interface, resourceEventHandler cache.
 	// We are interested in pods which are Running or Unknown (in case the pod is
 	// running but there are some transient errors we don't want to delete it from
 	// our model).
-	// We don't want to watch Pending, Succeeded, or Failed failed pods because we
-	// know they're not generating any usage.
-	// Filter
-	statusFilter := fmt.Sprintf("status.phase!=%s,status.phase!=%s,status.phase!=%s", apiv1.PodPending, apiv1.PodSucceeded, apiv1.PodFailed)
-	selector := fields.ParseSelectorOrDie(statusFilter)
+	// We don't want to watch Pending pods because they didn't generate any usage
+	// yet.
+	// Succeeded and Failed failed pods don't generate any usage anymore but we
+	// don't necessarily want to immediately delete them.
+	selector := fields.ParseSelectorOrDie("status.phase!=" + string(apiv1.PodPending))
 	podListWatch := cache.NewListWatchFromClient(kubeClient.CoreV1().RESTClient(), "pods", namespace, selector)
 	indexer, controller := cache.NewIndexerInformer(
 		podListWatch,