bug: fix context and gomega usage in tests

Signed-off-by: Kevin Conner <[email protected]>

Author: knrc

internal/controller/pod_controller_test.go

@@ -116,7 +116,7 @@ var _ = Describe("PodReconciler", func() {
 			Expect(removeEvents).To(HaveLen(1))
 			Expect(removeEvents[0]).To(Equal(pod.UID))
 
-			Eventually(func() []string {
+			Eventually(ctx, func(ctx context.Context) []string {
 				updatedPod := &corev1.Pod{}
 				err := fakeClient.Get(ctx, req.NamespacedName, updatedPod)
 				if err != nil {

internal/tracker/status_tracker_test.go

@@ -43,7 +43,7 @@ func expectPodCount(
 	mvKey types.NamespacedName,
 	injected, uninjected, orphaned int32,
 ) {
-	Eventually(func() bool {
+	Eventually(ctx, func(ctx context.Context) bool {
 		updatedMV := testutil.GetModelValidationFromClientExpected(ctx, fakeClient, mvKey)
 		return updatedMV.Status.InjectedPodCount == injected &&
 			updatedMV.Status.UninjectedPodCount == uninjected &&

internal/webhooks/pod_webhook_test.go

@@ -80,15 +80,15 @@ var _ = Describe("Pod webhook", func() {
 
 			By("Checking that validation sidecar was created")
 			found := &corev1.Pod{}
-			Eventually(func() error {
+			Eventually(ctx, func(ctx context.Context) error {
 				return k8sClient.Get(ctx, typeNamespaceName, found)
-			}).Should(Succeed())
+			}, 5*time.Second).Should(Succeed())
 
-			Eventually(
-				func(_ Gomega) []corev1.Container {
-					Expect(k8sClient.Get(ctx, typeNamespaceName, found)).To(Succeed())
+			Eventually(ctx,
+				func(g Gomega, ctx context.Context) []corev1.Container {
+					g.Expect(k8sClient.Get(ctx, typeNamespaceName, found)).To(Succeed())
 					return found.Spec.InitContainers
-				},
+				}, 5*time.Second,
 			).Should(And(
 				WithTransform(func(containers []corev1.Container) int { return len(containers) }, Equal(1)),
 				WithTransform(
@@ -112,17 +112,17 @@ var _ = Describe("Pod webhook", func() {
 
 			By("Waiting for pod to be injected")
 			found := &corev1.Pod{}
-			Eventually(func() []corev1.Container {
+			Eventually(ctx, func(ctx context.Context) []corev1.Container {
 				_ = k8sClient.Get(ctx, types.NamespacedName{Name: "tracked-pod", Namespace: Namespace}, found)
 				return found.Spec.InitContainers
-			}).Should(HaveLen(1))
+			}, 5*time.Second).Should(HaveLen(1))
 
 			err = statusTracker.ProcessPodEvent(ctx, found)
 			Expect(err).To(Not(HaveOccurred()))
 
 			By("Checking ModelValidation status was updated")
 			mv := &v1alpha1.ModelValidation{}
-			Eventually(func() int32 {
+			Eventually(ctx, func(ctx context.Context) int32 {
 				_ = k8sClient.Get(ctx, typeNamespaceName, mv)
 				return mv.Status.InjectedPodCount
 			}, 5*time.Second).Should(BeNumerically(">", 0))