Merge pull request #485 from mlguerrero12/fixstateless

Skip pods marked for deletion

pkg/reconciler/wrappedPod.go

@@ -46,6 +46,12 @@ func indexPods(livePodList []v1.Pod, whereaboutsPodNames map[string]void) map[st
 		if _, isWhereaboutsPod := whereaboutsPodNames[podRef]; !isWhereaboutsPod {
 			continue
 		}
+
+		if isPodMarkedForDeletion(pod.Status.Conditions) {
+			logging.Debugf("Pod %s is marked for deletion; skipping", podRef)
+			continue
+		}
+
 		wrappedPod := wrapPod(pod)
 		if wrappedPod != nil {
 			podMap[podRef] = *wrappedPod
@@ -54,6 +60,15 @@ func indexPods(livePodList []v1.Pod, whereaboutsPodNames map[string]void) map[st
 	return podMap
 }
 
+func isPodMarkedForDeletion(conditions []v1.PodCondition) bool {
+	for _, c := range conditions {
+		if c.Type == v1.DisruptionTarget && c.Status == v1.ConditionTrue && c.Reason == "DeletionByTaintManager" {
+			return true
+		}
+	}
+	return false
+}
+
 func getFlatIPSet(pod v1.Pod) (map[string]void, error) {
 	var empty void
 	ipSet := map[string]void{}