fluxcd
/
notification-controller
mirror of https://github.com/fluxcd/notification-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use `ProgressingWithRetry` from `fluxcd/pkg/apis/meta` 

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
This commit is contained in:
Stefan Prodan 2022-11-15 17:16:08 +02:00 committed by Hidde Beydals
parent d16588a193
commit 5a0d6dde0a
7 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/v1beta2/condition_types.go
View File

@ -28,8 +28,4 @@ const (
// TokenNotFoundReason represents the fact that receiver token can't be found. // TokenNotFoundReason represents the fact that receiver token can't be found.
TokenNotFoundReason string = "TokenNotFound" TokenNotFoundReason string = "TokenNotFound"
// ProgressingWithRetryReason represents the fact that
// the reconciliation encountered an error that will be retried.
ProgressingWithRetryReason string = "ProgressingWithRetry"
) )

2
controllers/alert_controller.go
View File

@ -241,7 +241,7 @@ func (r *AlertReconciler) patch(ctx context.Context, obj *apiv1.Alert, patcher *
if conditions.IsFalse(obj, meta.ReadyCondition) && if conditions.IsFalse(obj, meta.ReadyCondition) &&
conditions.Has(obj, meta.ReconcilingCondition) { conditions.Has(obj, meta.ReconcilingCondition) {
rc := conditions.Get(obj, meta.ReconcilingCondition) rc := conditions.Get(obj, meta.ReconcilingCondition)
rc.Reason = apiv1.ProgressingWithRetryReason rc.Reason = meta.ProgressingWithRetryReason
conditions.Set(obj, rc) conditions.Set(obj, rc)
} }

2
controllers/alert_controller_test.go
View File

@ -99,7 +99,7 @@ func TestAlertReconciler_Reconcile(t *testing.T) {
g.Expect(conditions.GetMessage(resultA, meta.ReadyCondition)).To(ContainSubstring(providerName)) g.Expect(conditions.GetMessage(resultA, meta.ReadyCondition)).To(ContainSubstring(providerName))
g.Expect(conditions.Has(resultA, meta.ReconcilingCondition)).To(BeTrue()) 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(conditions.GetObservedGeneration(resultA, meta.ReconcilingCondition)).To(BeIdenticalTo(resultA.Generation))
g.Expect(controllerutil.ContainsFinalizer(resultA, apiv1.NotificationFinalizer)).To(BeTrue()) g.Expect(controllerutil.ContainsFinalizer(resultA, apiv1.NotificationFinalizer)).To(BeTrue())
}) })

4
controllers/provider_controller.go
View File

@ -146,7 +146,7 @@ func (r *ProviderReconciler) reconcile(ctx context.Context, obj *apiv1.Provider)
// Validate the provider inline address and proxy. // Validate the provider inline address and proxy.
if err := r.validateURLs(obj); err != nil { 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 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) && if conditions.IsFalse(obj, meta.ReadyCondition) &&
conditions.Has(obj, meta.ReconcilingCondition) { conditions.Has(obj, meta.ReconcilingCondition) {
rc := conditions.Get(obj, meta.ReconcilingCondition) rc := conditions.Get(obj, meta.ReconcilingCondition)
rc.Reason = apiv1.ProgressingWithRetryReason rc.Reason = meta.ProgressingWithRetryReason
conditions.Set(obj, rc) conditions.Set(obj, rc)
} }

2
controllers/provider_controller_test.go
View File

@ -91,7 +91,7 @@ func TestProviderReconciler_Reconcile(t *testing.T) {
g.Expect(conditions.GetMessage(resultP, meta.ReadyCondition)).To(ContainSubstring(secretName)) g.Expect(conditions.GetMessage(resultP, meta.ReadyCondition)).To(ContainSubstring(secretName))
g.Expect(conditions.Has(resultP, meta.ReconcilingCondition)).To(BeTrue()) 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(conditions.GetObservedGeneration(resultP, meta.ReconcilingCondition)).To(BeIdenticalTo(resultP.Generation))
g.Expect(resultP.Status.ObservedGeneration).To(BeIdenticalTo(resultP.Generation - 1)) g.Expect(resultP.Status.ObservedGeneration).To(BeIdenticalTo(resultP.Generation - 1))
}) })

2
controllers/receiver_controller.go
View File

@ -206,7 +206,7 @@ func (r *ReceiverReconciler) patch(ctx context.Context, obj *apiv1.Receiver, pat
if conditions.IsFalse(obj, meta.ReadyCondition) && if conditions.IsFalse(obj, meta.ReadyCondition) &&
conditions.Has(obj, meta.ReconcilingCondition) { conditions.Has(obj, meta.ReconcilingCondition) {
rc := conditions.Get(obj, meta.ReconcilingCondition) rc := conditions.Get(obj, meta.ReconcilingCondition)
rc.Reason = apiv1.ProgressingWithRetryReason rc.Reason = meta.ProgressingWithRetryReason
conditions.Set(obj, rc) conditions.Set(obj, rc)
} }

2
controllers/receiver_controller_test.go
View File

@ -121,7 +121,7 @@ func TestReceiverReconciler_Reconcile(t *testing.T) {
g.Expect(conditions.GetMessage(resultR, meta.ReadyCondition)).To(ContainSubstring(secretName)) g.Expect(conditions.GetMessage(resultR, meta.ReadyCondition)).To(ContainSubstring(secretName))
g.Expect(conditions.Has(resultR, meta.ReconcilingCondition)).To(BeTrue()) 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)) g.Expect(conditions.GetObservedGeneration(resultR, meta.ReconcilingCondition)).To(BeIdenticalTo(resultR.Generation))
}) })