Merge pull request #925 from openshift-cherrypick-robot/cherry-pick-922-to-release-4.16

[release-4.16] OCPBUGS-47738:catalog-operator: Delete Pods that were evicted (#3459)

Author: openshift-merge-bot[bot]

staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc.go

@@ -531,6 +531,7 @@ func imageChanged(logger *logrus.Entry, updatePod *corev1.Pod, servingPods []*co
 func isPodDead(pod *corev1.Pod) bool {
 	for _, check := range []func(*corev1.Pod) bool{
 		isPodDeletedByTaintManager,
+		isPodTerminatedByKubelet,
 	} {
 		if check(pod) {
 			return true
@@ -551,6 +552,19 @@ func isPodDeletedByTaintManager(pod *corev1.Pod) bool {
 	return false
 }
 
+// This reason is set when the Pod was evicted due to resource pressure on the Node
+func isPodTerminatedByKubelet(pod *corev1.Pod) bool {
+	if pod.DeletionTimestamp == nil {
+		return false
+	}
+	for _, condition := range pod.Status.Conditions {
+		if condition.Type == corev1.DisruptionTarget && condition.Reason == "TerminationByKubelet" && condition.Status == corev1.ConditionTrue {
+			return true
+		}
+	}
+	return false
+}
+
 // imageID returns the ImageID of the primary catalog source container or an empty string if the image ID isn't available yet.
 // Note: the pod must be running and the container in a ready status to return a valid ImageID.
 func imageID(pod *corev1.Pod) string {