diff --git a/api/v1alpha1/condition_types.go b/api/v1alpha1/condition_types.go index ca7150a..5783970 100644 --- a/api/v1alpha1/condition_types.go +++ b/api/v1alpha1/condition_types.go @@ -59,6 +59,9 @@ const ( // ReconciliationFailedReason represents the fact that the reconciliation of the resource has failed. ReconciliationFailedReason string = "ReconciliationFailed" + // ImageURLInvalidReason represents the fact that a given repository has an invalid image URL. + ImageURLInvalidReason string = "ImageURLInvalid" + // ProgressingReason represents the fact that a reconciliation is underway. ProgressingReason string = "Progressing" diff --git a/controllers/imagerepository_controller.go b/controllers/imagerepository_controller.go index 23ef5dd..e93bbc8 100644 --- a/controllers/imagerepository_controller.go +++ b/controllers/imagerepository_controller.go @@ -76,14 +76,14 @@ func (r *ImageRepositoryReconciler) Reconcile(req ctrl.Request) (ctrl.Result, er status := imagev1alpha1.SetImageRepositoryReadiness( imageRepo, corev1.ConditionFalse, - imagev1alpha1.ReconciliationFailedReason, + imagev1alpha1.ImageURLInvalidReason, err.Error(), ) if err := r.Status().Update(ctx, &status); err != nil { return ctrl.Result{Requeue: true}, err } log.Error(err, "Unable to parse image name", "imageName", imageRepo.Spec.Image) - return ctrl.Result{}, err + return ctrl.Result{}, nil } imageRepo.Status.CanonicalImageName = ref.Context().String() @@ -100,7 +100,7 @@ func (r *ImageRepositoryReconciler) Reconcile(req ctrl.Request) (ctrl.Result, er } if reconcileErr != nil { - return ctrl.Result{RequeueAfter: when}, reconcileErr + return ctrl.Result{Requeue: true}, reconcileErr } else { log.Info(fmt.Sprintf("reconciliation finished in %s, next run in %s", time.Now().Sub(now).String(),