fix imagelist and imagejob resource errors (eraser-dev#106)

Co-authored-by: Brian Goff <[email protected]>
vyta · Feb 24, 2022 · b7aec99 · b7aec99
1 parent 39a7032
commit b7aec99
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/controllers/imagejob/imagejob_controller.go b/controllers/imagejob/imagejob_controller.go
@@ -136,7 +136,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		if err := r.updateJobStatus(ctx, imageJob); err != nil {
 			return ctrl.Result{}, err
 		}
-		return ctrl.Result{}, err
+		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
 	switch imageJob.Status.Phase {
@@ -361,8 +361,10 @@ func (r *Reconciler) updateImageListStatus(
 }
 
 func (r *Reconciler) updateJobStatus(ctx context.Context, imageJob *eraserv1alpha1.ImageJob) error {
-	if err := r.Status().Update(ctx, imageJob); err != nil {
-		return err
+	if imageJob.Name != "" {
+		if err := r.Status().Update(ctx, imageJob); err != nil {
+			return err
+		}
 	}
 	return nil
 }
diff --git a/controllers/imagelist/imagelist_controller.go b/controllers/imagelist/imagelist_controller.go
@@ -88,7 +88,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 	imageList := &eraserv1alpha1.ImageList{}
 	err := r.Get(ctx, req.NamespacedName, imageList)
 	if err != nil {
-		return ctrl.Result{}, err
+		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
 	// Check to make sure reconcile isn't from updating ImageStatus