Cherry-pick: removing duplicate pods in logs list and fixing bug 2062…

…266 partially (#1302)

* removing duplicate pods in logs list and fixing bug 2062266 partially (#1301)

* looking for common velero pod label to find velero pods (#1303)

(cherry picked from commit 2260828)

pkg/controller/discovery/web/plan.go

@@ -1574,7 +1574,16 @@ func (p *PlanPods) buildPods(h *PlanHandler, ref *v1.ObjectReference) ([]PlanPod
 		for _, model := range podModels {
 			pod := PlanPod{}
 			pod.With(model, &cluster)
-			pods = append(pods, pod)
+			present := false
+			for _, p := range pods {
+				if p.Name == pod.Name {
+					present = true
+					break
+				}
+			}
+			if !present {
+				pods = append(pods, pod)
+			}
 		}
 	}
 

pkg/pods/velero.go

@@ -17,7 +17,7 @@ func FindVeleroPods(client k8sclient.Client) ([]corev1.Pod, error) {
 	list := &corev1.PodList{}
 	labelSelector := labels.SelectorFromSet(
 		map[string]string{
-			"component": "velero",
+			"app.kubernetes.io/instance": "velero",
 		})
 	fieldSelector := fields.SelectorFromSet(
 		map[string]string{