diff --git a/controllers/imagejob/imagejob_controller.go b/controllers/imagejob/imagejob_controller.go index b5c4757153..1b46d0eaf5 100644 --- 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 index 5116cb668e..09af8f358c 100644 --- 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