Fixed flaky tests in e2e_limit_classes (#2934)

* Added two new test scripts for ingressClasses and priorityClasses limit

* Added two new test scripts for ingressClasses and priorityClasses limit

* Removed comments and corrected values file

* Corrected values file for runtimeClasses

* Created a new folder structure for limit host classes tests

* Corrected test/e2e/values.yaml

* Corrected test/e2e/values.yaml for runtimeClasses

* Corrected test/e2e/values.yaml for priorityClasses

* Removed storageClasses and priorityClasses sync.fromHost

* Removed ingressClasses sync.fromHost

* Added 2 P0 tests for stroageClasses and runtimeClasses, also did some changes as aked by Ulysses

* Added a verification of events for the resources created with not allowed classes and modified based on Sowmya's comments

* Fixed flaky test to verify the events in the resources when classes are not available

* Fixed flaky tests

* Fixed flaky tests

* Added polling for listing classes inside the vcluster

* Corrected a value

* Corrected a classname

* Changed the scripts as requested by Sowmya

* Changed the scripts as requested by Sowmya

* Removed conistent check of the classes inside the vCluster

* Changed the logic to check the ingressClasses in vCluster

---------

Co-authored-by: Akhila Rachel Oommen <akhilarachel@Mac.fritz.box>

Author: akhilaoommen

test/e2e_limit_classes/limitClasses/ingressClasses.go

@@ -1,7 +1,6 @@
 package limitclasses
 
 import (
-	"fmt"
 	"time"
 
 	"github.com/loft-sh/vcluster/test/framework"
@@ -66,19 +65,29 @@ var _ = ginkgo.Describe("Test limitclass on fromHost", ginkgo.Ordered, func() {
 
 	ginkgo.It("should only sync ingressClasses with allowed label to vcluster", func() {
 		ginkgo.By("Listing all ingresssesClasses available in vcluster")
-		ics, err := f.VClusterClient.NetworkingV1().IngressClasses().List(f.Context, metav1.ListOptions{})
-		gomega.Expect(err).NotTo(gomega.HaveOccurred())
-		var names []string
-		for _, ic := range ics.Items {
-			names = append(names, ic.Name)
-		}
-		gomega.Expect(names).To(gomega.ContainElement(nginxClassName))
-		ginkgo.By("Found nginx-ingressclass in vcluster")
-		gomega.Expect(names).NotTo(gomega.ContainElement(haproxyClassName))
-		ginkgo.By("haproxy-ingressclass is not available in vcluster")
+		gomega.Eventually(func() bool {
+			ingressClasses, err := f.VClusterClient.NetworkingV1().IngressClasses().List(f.Context, metav1.ListOptions{})
+			if err != nil {
+				return false
+			}
+			foundNginxIngressClass := false
+			foundHaproxyIngressClass := false
+			for _, ingressClass := range ingressClasses.Items {
+				if ingressClass.Name == nginxClassName {
+					foundNginxIngressClass = true
+				}
+				if ingressClass.Name == haproxyClassName {
+					foundHaproxyIngressClass = true
+				}
+			}
+			return foundNginxIngressClass && !foundHaproxyIngressClass
+		}).
+			WithPolling(time.Second).
+			WithTimeout(framework.PollTimeout).
+			Should(gomega.BeTrue(), "Timed out waiting for the ingressClasses in vCluster")
 	})
 
-	ginkgo.It("should not sync vcluster ingresses using a filtered ingressClass to host", func() {
+	ginkgo.It("should not sync vcluster ingresses created using an ingressClass not available in vCluster", func() {
 		ginkgo.By("Creating a haproxy-ingress using haproxy-ingressclass in vcluster")
 		haproxyIngress := &networkingv1.Ingress{
 			ObjectMeta: metav1.ObjectMeta{
@@ -119,22 +128,22 @@ var _ = ginkgo.Describe("Test limitclass on fromHost", ginkgo.Ordered, func() {
 
 		ginkgo.By("There should be a warning message event in the describe of the created ingress")
 		gomega.Eventually(func() bool {
-			eventList, err := f.VClusterClient.CoreV1().Events(testNamespace).List(f.Context, metav1.ListOptions{
-				FieldSelector: fmt.Sprintf("involvedObject.kind=Ingress,involvedObject.name=%s", haproxyIngressName),
-			})
+			eventList, err := f.VClusterClient.CoreV1().Events(testNamespace).List(f.Context, metav1.ListOptions{})
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 			for _, event := range eventList.Items {
-				if event.Type == corev1.EventTypeWarning && event.Reason == "SyncWarning" {
-					expectedSubstring := fmt.Sprintf(`did not sync ingress "%s" to host because the ingress class "%s" in the host does not match the selector under 'sync.fromHost.ingressClasses.selector'`, haproxyIngressName, haproxyClassName)
-					gomega.Expect(event.Message).To(gomega.ContainSubstring(expectedSubstring))
+				if event.InvolvedObject.Kind == "Ingress" && event.InvolvedObject.Name == haproxyIngressName && event.Type == corev1.EventTypeWarning && event.Reason == "SyncWarning" {
+					gomega.Expect(event.Message).To(gomega.ContainSubstring(`did not sync ingress "%s" to host because the ingress class "%s" in the host does not match the selector under 'sync.fromHost.ingressClasses.selector'`, haproxyIngressName, haproxyClassName))
 					return true
 				}
 			}
 			return false
-		}).WithTimeout(time.Minute).WithPolling(time.Second).Should(gomega.BeTrue(), "Timed out waiting for SyncWarning event for ingress %s", haproxyIngressName)
+		}).
+			WithTimeout(time.Minute).
+			WithPolling(time.Second).
+			Should(gomega.BeTrue(), "Timed out waiting for SyncWarning event for ingress %s", haproxyIngressName)
 	})
 
-	ginkgo.It("should sync vcluster ingresses using allowed ingressClass to host", func() {
+	ginkgo.It("should sync ingresses created in vcluster to host", func() {
 		ginkgo.By("Creating a nginx-ingress using nginx-ingressclass in vcluster")
 		nginxIngress := &networkingv1.Ingress{
 			ObjectMeta: metav1.ObjectMeta{
@@ -169,18 +178,22 @@ var _ = ginkgo.Describe("Test limitclass on fromHost", ginkgo.Ordered, func() {
 		_, err := f.VClusterClient.NetworkingV1().Ingresses(testNamespace).Create(f.Context, nginxIngress, metav1.CreateOptions{})
 		framework.ExpectNoError(err)
 
-		ginkgo.By("Ingress should be synced to host")
-		gomega.Eventually(func() []string {
-			igs, err := f.HostClient.NetworkingV1().Ingresses(hostNamespace).List(f.Context, metav1.ListOptions{})
+		ginkgo.By("should sync ingress created in vCluster to host using ingressClass synced from Host")
+		ginkgo.By("Listing all Ingresses in host's vcluster namespace")
+		gomega.Eventually(func() bool {
+			ingresses, err := f.HostClient.NetworkingV1().Ingresses(hostNamespace).List(f.Context, metav1.ListOptions{})
 			if err != nil {
-				return nil
+				return false
 			}
-			var names []string
-			for _, igc := range igs.Items {
-				names = append(names, igc.Name)
+			for _, ingress := range ingresses.Items {
+				if ingress.Name == nginxIngressName+"-x-"+testNamespace+"-x-"+hostNamespace {
+					return true
+				}
 			}
-			return names
-		}).WithTimeout(time.Minute).WithPolling(time.Second).
-			Should(gomega.ContainElement(nginxIngressName + "-x-" + testNamespace + "-x-" + hostNamespace))
+			return false
+		}).
+			WithTimeout(time.Minute).
+			WithPolling(time.Second).
+			Should(gomega.BeTrue(), "Timed out waiting for listing all ingresses in host")
 	})
 })

test/e2e_limit_classes/limitClasses/priorityClasses.go

@@ -1,7 +1,6 @@
 package limitclasses
 
 import (
-	"fmt"
 	"time"
 
 	"github.com/loft-sh/vcluster/test/framework"
@@ -66,19 +65,29 @@ var _ = ginkgo.Describe("Test limitclass on fromHost", ginkgo.Ordered, func() {
 
 	ginkgo.It("should only sync priorityClasses to virtual with allowed label", func() {
 		ginkgo.By("Listing all priorityClasses in vcluster")
-		pcs, err := f.VClusterClient.SchedulingV1().PriorityClasses().List(f.Context, metav1.ListOptions{})
-		gomega.Expect(err).NotTo(gomega.HaveOccurred())
-		var names []string
-		for _, pc := range pcs.Items {
-			names = append(names, pc.Name)
-		}
-		gomega.Expect(names).To(gomega.ContainElement(hpriorityClassName))
-		ginkgo.By("Found high-priority in vcluster")
-		gomega.Expect(names).NotTo(gomega.ContainElement(lpriorityClassName))
-		ginkgo.By("low-priority is not available in vcluster")
+		gomega.Eventually(func() bool {
+			priorityClasses, err := f.VClusterClient.SchedulingV1().PriorityClasses().List(f.Context, metav1.ListOptions{})
+			if err != nil {
+				return false
+			}
+			foundhighPriorityClass := false
+			foundlowPriorityClass := false
+			for _, priorityClass := range priorityClasses.Items {
+				if priorityClass.Name == hpriorityClassName {
+					foundhighPriorityClass = true
+				}
+				if priorityClass.Name == lpriorityClassName {
+					foundlowPriorityClass = true
+				}
+			}
+			return foundhighPriorityClass && !foundlowPriorityClass
+		}).
+			WithPolling(time.Second).
+			WithTimeout(framework.PollTimeout).
+			Should(gomega.BeTrue(), "Timed out waiting for the priorityClasses in vCluster")
 	})
 
-	ginkgo.It("should get an error for pod creation using filtered priorityClass to host", func() {
+	ginkgo.It("should get an error for pod creation in vcluster using an unavailable priorityClass", func() {
 		ginkgo.By("Creating a pod using low-prority priorityClass in vcluster")
 		lpPod := &corev1.Pod{
 			ObjectMeta: metav1.ObjectMeta{
@@ -97,11 +106,10 @@ var _ = ginkgo.Describe("Test limitclass on fromHost", ginkgo.Ordered, func() {
 		}
 		_, err := f.VClusterClient.CoreV1().Pods(testNamespace).Create(f.Context, lpPod, metav1.CreateOptions{})
 		ginkgo.By("An error should be triggered")
-		expectedSubstring := fmt.Sprintf(`pods "%s" is forbidden: no PriorityClass with name %s was found`, lpPodName, lpriorityClassName)
-		gomega.Expect(err).To(gomega.MatchError(gomega.ContainSubstring(expectedSubstring)))
+		gomega.Expect(err).To(gomega.MatchError(gomega.ContainSubstring(`pods "%s" is forbidden: no PriorityClass with name %s was found`, lpPodName, lpriorityClassName)))
 	})
 
-	ginkgo.It("should sync vcluster pod created with allowed priorityClass to host", func() {
+	ginkgo.It("should sync Pods created in vCluster to host using priorityClass synced from Host", func() {
 		ginkgo.By("Creating a pod using high-prority priorityClass in vcluster")
 		hpPod := &corev1.Pod{
 			ObjectMeta: metav1.ObjectMeta{
@@ -121,19 +129,22 @@ var _ = ginkgo.Describe("Test limitclass on fromHost", ginkgo.Ordered, func() {
 		_, err := f.VClusterClient.CoreV1().Pods(testNamespace).Create(f.Context, hpPod, metav1.CreateOptions{})
 		framework.ExpectNoError(err)
 
-		ginkgo.By("Pod should be synced to host")
-		gomega.Eventually(func() []string {
+		ginkgo.By("Listing all Pods in host's vcluster namespace")
+		gomega.Eventually(func() bool {
 			pods, err := f.HostClient.CoreV1().Pods(hostNamespace).List(f.Context, metav1.ListOptions{})
 			if err != nil {
-				return nil
+				return false
 			}
-			var names []string
 			for _, pod := range pods.Items {
-				names = append(names, pod.Name)
+				if pod.Name == hpPodName+"-x-"+testNamespace+"-x-"+hostNamespace {
+					return true
+				}
 			}
-			return names
-		}).WithTimeout(time.Minute).WithPolling(time.Second).
-			Should(gomega.ContainElement(hpPodName + "-x-" + testNamespace + "-x-" + hostNamespace))
+			return false
+		}).
+			WithTimeout(time.Minute).
+			WithPolling(time.Second).
+			Should(gomega.BeTrue(), "Timed out waiting for listing all pods in host")
 	})
 
 })

test/e2e_limit_classes/limitClasses/runtimeClasses.go

@@ -1,7 +1,6 @@
 package limitclasses
 
 import (
-	"fmt"
 	"time"
 
 	"github.com/loft-sh/vcluster/test/framework"
@@ -61,20 +60,30 @@ var _ = ginkgo.Describe("Test limitclass on fromHost", ginkgo.Ordered, func() {
 	})
 
 	ginkgo.It("should only sync runtimeClasses to virtual with allowed label", func() {
-		ginkgo.By("Listing all runtimeClasses in the vCluster")
-		rcs, err := f.VClusterClient.NodeV1().RuntimeClasses().List(f.Context, metav1.ListOptions{})
-		gomega.Expect(err).NotTo(gomega.HaveOccurred())
-		var names []string
-		for _, rc := range rcs.Items {
-			names = append(names, rc.Name)
-		}
-		gomega.Expect(names).To(gomega.ContainElement(runcClassName))
-		ginkgo.By("Found runc in vcluster")
-		gomega.Expect(names).NotTo(gomega.ContainElement(runscClassName))
-		ginkgo.By("runsc is not available in vcluster")
+		ginkgo.By("Listing all runtimeClasses in vCluster")
+		gomega.Eventually(func() bool {
+			runtimeClasses, err := f.VClusterClient.NodeV1().RuntimeClasses().List(f.Context, metav1.ListOptions{})
+			if err != nil {
+				return false
+			}
+			foundRuncClass := false
+			foundRunscClass := false
+			for _, runtimeClass := range runtimeClasses.Items {
+				if runtimeClass.Name == runcClassName {
+					foundRuncClass = true
+				}
+				if runtimeClass.Name == runscClassName {
+					foundRunscClass = true
+				}
+			}
+			return foundRuncClass && !foundRunscClass
+		}).
+			WithPolling(time.Second).
+			WithTimeout(framework.PollTimeout).
+			Should(gomega.BeTrue(), "Timed out waiting for the runtimeClasses in vCluster")
 	})
 
-	ginkgo.It("should get an error for pod creation using filtered runtimeClass to host", func() {
+	ginkgo.It("should get an error for pod creation in vcluster using an unavailable runtimeClass", func() {
 		ginkgo.By("Creating a pod using runsc runtimeClass in vcluster")
 		runscpod := &corev1.Pod{
 			ObjectMeta: metav1.ObjectMeta{
@@ -98,11 +107,10 @@ var _ = ginkgo.Describe("Test limitclass on fromHost", ginkgo.Ordered, func() {
 		}
 		_, err := f.VClusterClient.CoreV1().Pods(testNamespace).Create(f.Context, runscpod, metav1.CreateOptions{})
 		ginkgo.By("An error should be triggered")
-		expectedSubstring := fmt.Sprintf(`pods "%s" is forbidden: pod rejected: RuntimeClass "%s" not found`, rscPodName, runscClassName)
-		gomega.Expect(err).To(gomega.MatchError(gomega.ContainSubstring(expectedSubstring)))
+		gomega.Expect(err).To(gomega.MatchError(gomega.ContainSubstring(`pods "%s" is forbidden: pod rejected: RuntimeClass "%s" not found`, rscPodName, runscClassName)))
 	})
 
-	ginkgo.It("should sync vcluster pod created with allowed runtimeClass to host", func() {
+	ginkgo.It("should sync Pods created in vCluster to host using runtimeClass synced from Host", func() {
 		ginkgo.By("Creating a pod using runc runtimeClass in vcluster")
 		runcpod := &corev1.Pod{
 			ObjectMeta: metav1.ObjectMeta{
@@ -127,20 +135,21 @@ var _ = ginkgo.Describe("Test limitclass on fromHost", ginkgo.Ordered, func() {
 		_, err := f.VClusterClient.CoreV1().Pods(testNamespace).Create(f.Context, runcpod, metav1.CreateOptions{})
 		framework.ExpectNoError(err)
 
-		ginkgo.By("Pod should be synced to host")
-		gomega.Eventually(func() []string {
-			pods, err := f.HostClient.CoreV1().Pods(hostNamespace).List(f.Context, metav1.ListOptions{}) // List all pods in the vCluster
+		ginkgo.By("Listing all Pods in host's vcluster namespace")
+		gomega.Eventually(func() bool {
+			pods, err := f.HostClient.CoreV1().Pods(hostNamespace).List(f.Context, metav1.ListOptions{})
 			if err != nil {
-				return nil
+				return false
 			}
-			var names []string
-			for _, po := range pods.Items {
-				names = append(names, po.Name)
+			for _, pod := range pods.Items {
+				if pod.Name == rcPodName+"-x-"+testNamespace+"-x-"+hostNamespace {
+					return true
+				}
 			}
-			return names
-		}).WithTimeout(time.Minute).WithPolling(time.Second).
-			Should(gomega.ContainElement(rcPodName + "-x-" + testNamespace + "-x-" + hostNamespace))
-
+			return false
+		}).
+			WithTimeout(time.Minute).
+			WithPolling(time.Second).
+			Should(gomega.BeTrue(), "Timed out waiting for listing all pods in host")
 	})
-
 })