try to find pod with label instead

Signed-off-by: Tuomas Katila <[email protected]>

Author: tkatila

test/e2e/fpga/fpga.go

@@ -20,7 +20,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"strings"
 	"time"
 
 	"github.com/intel/intel-device-plugins-for-kubernetes/test/e2e/utils"
@@ -66,31 +65,40 @@ func describe() {
 	fmw.NamespacePodSecurityEnforceLevel = admissionapi.LevelPrivileged
 
 	ginkgo.AfterEach(func(ctx context.Context) {
-		ginkgo.By("undeploying fpga daemonset and mapping")
+		ginkgo.By("undeploying eeeeverything")
 
 		e2ekubectl.RunKubectlOrDie(fmw.Namespace.Name, "delete", "-f", mappingsCollectionPath)
 
+		ginkgo.By("undeployed mappings")
+
 		pods, err := e2epod.GetPodsInNamespace(ctx, fmw.ClientSet, fmw.Namespace.Name, nil)
 		if err != nil {
 			framework.Failf("Failed to list pods in namespace: %+v", err)
 		}
 
+		ginkgo.By("trying to find Pods")
+
 		dpPodName := ""
 
 		for _, pod := range pods {
-			if strings.HasPrefix(pod.Name, "intel-fpga-plugin") {
+			if pod.Labels["app"] == "intel-fpga-plugin" {
 				dpPodName = pod.Name
+
 				break
 			}
 		}
 
+		ginkgo.By(fmt.Sprintf("pod name found maybe: %s", dpPodName))
+
 		if dpPodName != "" {
 			e2ekubectl.RunKubectlOrDie(fmw.Namespace.Name, "delete", "ds", "intel-fpga-plugin")
 
 			if err := e2epod.WaitForPodNotFoundInNamespace(ctx, fmw.ClientSet, dpPodName, fmw.Namespace.Name, 30*time.Second); err != nil {
 				framework.Failf("failed to terminate pod: %v", err)
 			}
 		}
+
+		ginkgo.By("Done with all of this")
 	})
 
 	ginkgo.Context("When FPGA plugin is running in region mode [Mode:region]", func() {