diff --git a/api/v1beta2/condition_types.go b/api/v1beta2/condition_types.go index 1193457..9ad629e 100644 --- a/api/v1beta2/condition_types.go +++ b/api/v1beta2/condition_types.go @@ -28,8 +28,4 @@ const ( // TokenNotFoundReason represents the fact that receiver token can't be found. TokenNotFoundReason string = "TokenNotFound" - - // ProgressingWithRetryReason represents the fact that - // the reconciliation encountered an error that will be retried. - ProgressingWithRetryReason string = "ProgressingWithRetry" ) diff --git a/controllers/alert_controller.go b/controllers/alert_controller.go index 4bf82b3..5e3dd62 100644 --- a/controllers/alert_controller.go +++ b/controllers/alert_controller.go @@ -241,7 +241,7 @@ func (r *AlertReconciler) patch(ctx context.Context, obj *apiv1.Alert, patcher * if conditions.IsFalse(obj, meta.ReadyCondition) && conditions.Has(obj, meta.ReconcilingCondition) { rc := conditions.Get(obj, meta.ReconcilingCondition) - rc.Reason = apiv1.ProgressingWithRetryReason + rc.Reason = meta.ProgressingWithRetryReason conditions.Set(obj, rc) } diff --git a/controllers/alert_controller_test.go b/controllers/alert_controller_test.go index a6d4288..0c50f13 100644 --- a/controllers/alert_controller_test.go +++ b/controllers/alert_controller_test.go @@ -99,7 +99,7 @@ func TestAlertReconciler_Reconcile(t *testing.T) { g.Expect(conditions.GetMessage(resultA, meta.ReadyCondition)).To(ContainSubstring(providerName)) g.Expect(conditions.Has(resultA, meta.ReconcilingCondition)).To(BeTrue()) - g.Expect(conditions.GetReason(resultA, meta.ReconcilingCondition)).To(BeIdenticalTo(apiv1.ProgressingWithRetryReason)) + g.Expect(conditions.GetReason(resultA, meta.ReconcilingCondition)).To(BeIdenticalTo(meta.ProgressingWithRetryReason)) g.Expect(conditions.GetObservedGeneration(resultA, meta.ReconcilingCondition)).To(BeIdenticalTo(resultA.Generation)) g.Expect(controllerutil.ContainsFinalizer(resultA, apiv1.NotificationFinalizer)).To(BeTrue()) }) diff --git a/controllers/provider_controller.go b/controllers/provider_controller.go index fdeb618..dc16419 100644 --- a/controllers/provider_controller.go +++ b/controllers/provider_controller.go @@ -146,7 +146,7 @@ func (r *ProviderReconciler) reconcile(ctx context.Context, obj *apiv1.Provider) // Validate the provider inline address and proxy. if err := r.validateURLs(obj); err != nil { - conditions.MarkFalse(obj, meta.ReadyCondition, apiv1.ValidationFailedReason, err.Error()) + conditions.MarkFalse(obj, meta.ReadyCondition, meta.InvalidURLReason, err.Error()) return ctrl.Result{Requeue: true}, err } @@ -284,7 +284,7 @@ func (r *ProviderReconciler) patch(ctx context.Context, obj *apiv1.Provider, pat if conditions.IsFalse(obj, meta.ReadyCondition) && conditions.Has(obj, meta.ReconcilingCondition) { rc := conditions.Get(obj, meta.ReconcilingCondition) - rc.Reason = apiv1.ProgressingWithRetryReason + rc.Reason = meta.ProgressingWithRetryReason conditions.Set(obj, rc) } diff --git a/controllers/provider_controller_test.go b/controllers/provider_controller_test.go index f6cac06..0210058 100644 --- a/controllers/provider_controller_test.go +++ b/controllers/provider_controller_test.go @@ -91,7 +91,7 @@ func TestProviderReconciler_Reconcile(t *testing.T) { g.Expect(conditions.GetMessage(resultP, meta.ReadyCondition)).To(ContainSubstring(secretName)) g.Expect(conditions.Has(resultP, meta.ReconcilingCondition)).To(BeTrue()) - g.Expect(conditions.GetReason(resultP, meta.ReconcilingCondition)).To(BeIdenticalTo(apiv1.ProgressingWithRetryReason)) + g.Expect(conditions.GetReason(resultP, meta.ReconcilingCondition)).To(BeIdenticalTo(meta.ProgressingWithRetryReason)) g.Expect(conditions.GetObservedGeneration(resultP, meta.ReconcilingCondition)).To(BeIdenticalTo(resultP.Generation)) g.Expect(resultP.Status.ObservedGeneration).To(BeIdenticalTo(resultP.Generation - 1)) }) diff --git a/controllers/receiver_controller.go b/controllers/receiver_controller.go index ce2550f..4253de5 100644 --- a/controllers/receiver_controller.go +++ b/controllers/receiver_controller.go @@ -206,7 +206,7 @@ func (r *ReceiverReconciler) patch(ctx context.Context, obj *apiv1.Receiver, pat if conditions.IsFalse(obj, meta.ReadyCondition) && conditions.Has(obj, meta.ReconcilingCondition) { rc := conditions.Get(obj, meta.ReconcilingCondition) - rc.Reason = apiv1.ProgressingWithRetryReason + rc.Reason = meta.ProgressingWithRetryReason conditions.Set(obj, rc) } diff --git a/controllers/receiver_controller_test.go b/controllers/receiver_controller_test.go index 26a0126..b74f914 100644 --- a/controllers/receiver_controller_test.go +++ b/controllers/receiver_controller_test.go @@ -121,7 +121,7 @@ func TestReceiverReconciler_Reconcile(t *testing.T) { g.Expect(conditions.GetMessage(resultR, meta.ReadyCondition)).To(ContainSubstring(secretName)) g.Expect(conditions.Has(resultR, meta.ReconcilingCondition)).To(BeTrue()) - g.Expect(conditions.GetReason(resultR, meta.ReconcilingCondition)).To(BeIdenticalTo(apiv1.ProgressingWithRetryReason)) + g.Expect(conditions.GetReason(resultR, meta.ReconcilingCondition)).To(BeIdenticalTo(meta.ProgressingWithRetryReason)) g.Expect(conditions.GetObservedGeneration(resultR, meta.ReconcilingCondition)).To(BeIdenticalTo(resultR.Generation)) })