Address failure in imagelist_rm_images e2e test

Signed-off-by: Peter Engelbert <pmengelbert@gmail.com>
pmengelbert · Dec 29, 2022 · 59460e9 · 59460e9
1 parent ff578d9
commit 59460e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/controllers/imagelist/imagelist_controller.go b/controllers/imagelist/imagelist_controller.go
@@ -289,7 +289,7 @@ func (r *Reconciler) handleImageListEvent(ctx context.Context, req *ctrl.Request
 				util.ImageJobOwnerLabelKey: ownerLabelValue,
 			},
 			OwnerReferences: []metav1.OwnerReference{
-				*metav1.NewControllerRef(imageList, imageList.GroupVersionKind()),
+				*metav1.NewControllerRef(imageList, eraserv1alpha1.GroupVersion.WithKind("ImageList")),
 			},
 		},
 	}
@@ -339,7 +339,7 @@ func (r *Reconciler) handleImageListEvent(ctx context.Context, req *ctrl.Request
 		return reconcile.Result{}, err
 	}
 
-	configMap.ObjectMeta.OwnerReferences = []metav1.OwnerReference{*metav1.NewControllerRef(job, job.GroupVersionKind())}
+	configMap.ObjectMeta.OwnerReferences = []metav1.OwnerReference{*metav1.NewControllerRef(job, eraserv1alpha1.GroupVersion.WithKind("ImageJob"))}
 	err = r.Update(ctx, &configMap)
 	if err != nil {
 		return reconcile.Result{}, err

diff --git a/test/e2e/tests/imagelist_rm_images/eraser_test.go b/test/e2e/tests/imagelist_rm_images/eraser_test.go
@@ -38,22 +38,7 @@ func TestImageListTriggersEraserImageJob(t *testing.T) {
 			}
 
 			client := cfg.Client()
-			// wait for all collector pods to be present before removing them
 			err := wait.For(
-				util.NumPodsPresentForLabel(ctx, client, 3, collectorLabel),
-				wait.WithTimeout(time.Minute*2),
-				wait.WithInterval(time.Millisecond*500),
-			)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			if err := util.DeleteImageListsAndJobs(cfg.KubeconfigFile()); err != nil {
-				t.Error("Failed to clean eraser obejcts ", err)
-			}
-
-			// wait for collector deployment to be removed, to prevent conflicts or races
-			err = wait.For(
 				util.NumPodsPresentForLabel(ctx, client, 0, collectorLabel),
 				wait.WithTimeout(time.Minute*2),
 				wait.WithInterval(time.Millisecond*500),