Merge pull request #261 from SomtochiAma/observerd-generation

Set observed generation when recording status
fluxcd · Oct 13, 2021 · a91724b · a91724b
2 parents 7eac4bd + 209d01e
commit a91724b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/api/v1beta1/alert_types.go b/api/v1beta1/alert_types.go
@@ -101,3 +101,9 @@ type AlertList struct {
 func init() {
 	SchemeBuilder.Register(&Alert{}, &AlertList{})
 }
+
+func SetAlertReadiness(alert Alert, status metav1.ConditionStatus, reason, message string) Alert {
+	meta.SetResourceCondition(&alert, meta.ReadyCondition, status, reason, message)
+	alert.Status.ObservedGeneration = alert.Generation
+	return alert
+}
diff --git a/api/v1beta1/provider_types.go b/api/v1beta1/provider_types.go
@@ -127,3 +127,9 @@ type ProviderList struct {
 func init() {
 	SchemeBuilder.Register(&Provider{}, &ProviderList{})
 }
+
+func SetProviderReadiness(provider Provider, status metav1.ConditionStatus, reason, message string) Provider {
+	meta.SetResourceCondition(&provider, meta.ReadyCondition, status, reason, message)
+	provider.Status.ObservedGeneration = provider.Generation
+	return provider
+}
diff --git a/api/v1beta1/receiver_types.go b/api/v1beta1/receiver_types.go
@@ -82,12 +82,14 @@ const (
 
 func ReceiverReady(receiver Receiver, reason, message, url string) Receiver {
 	meta.SetResourceCondition(&receiver, meta.ReadyCondition, metav1.ConditionTrue, reason, message)
+	receiver.Status.ObservedGeneration = receiver.Generation
 	receiver.Status.URL = url
 	return receiver
 }
 
 func ReceiverNotReady(receiver Receiver, reason, message string) Receiver {
 	meta.SetResourceCondition(&receiver, meta.ReadyCondition, metav1.ConditionFalse, reason, message)
+	receiver.Status.ObservedGeneration = receiver.Generation
 	return receiver
 }
 

diff --git a/controllers/alert_controller.go b/controllers/alert_controller.go
@@ -71,16 +71,15 @@ func (r *AlertReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl
 
 	// validate alert spec and provider
 	if err := r.validate(ctx, alert); err != nil {
-		meta.SetResourceCondition(&alert, meta.ReadyCondition, metav1.ConditionFalse, meta.ReconciliationFailedReason, err.Error())
+		alert = v1beta1.SetAlertReadiness(alert, metav1.ConditionFalse, meta.ReconciliationFailedReason, err.Error())
 		if err := r.patchStatus(ctx, req, alert.Status); err != nil {
 			return ctrl.Result{Requeue: true}, err
 		}
 		return ctrl.Result{Requeue: true}, err
 	}
 
 	if !apimeta.IsStatusConditionTrue(alert.Status.Conditions, meta.ReadyCondition) || alert.Status.ObservedGeneration != alert.Generation {
-		meta.SetResourceCondition(&alert, meta.ReadyCondition, metav1.ConditionTrue, v1beta1.InitializedReason, v1beta1.InitializedReason)
-		alert.Status.ObservedGeneration = alert.Generation
+		alert = v1beta1.SetAlertReadiness(alert, metav1.ConditionTrue, v1beta1.InitializedReason, v1beta1.InitializedReason)
 		if err := r.patchStatus(ctx, req, alert.Status); err != nil {
 			return ctrl.Result{Requeue: true}, err
 		}

diff --git a/controllers/provider_controller.go b/controllers/provider_controller.go
@@ -71,15 +71,15 @@ func (r *ProviderReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 
 	// validate provider spec and credentials
 	if err := r.validate(ctx, provider); err != nil {
-		meta.SetResourceCondition(&provider, meta.ReadyCondition, metav1.ConditionFalse, meta.ReconciliationFailedReason, err.Error())
+		provider = v1beta1.SetProviderReadiness(provider, metav1.ConditionFalse, meta.ReconciliationFailedReason, err.Error())
 		if err := r.patchStatus(ctx, req, provider.Status); err != nil {
 			return ctrl.Result{Requeue: true}, err
 		}
 		return ctrl.Result{Requeue: true}, err
 	}
 
 	if !apimeta.IsStatusConditionTrue(provider.Status.Conditions, meta.ReadyCondition) {
-		meta.SetResourceCondition(&provider, meta.ReadyCondition, metav1.ConditionTrue, v1beta1.InitializedReason, v1beta1.InitializedReason)
+		provider = v1beta1.SetProviderReadiness(provider, metav1.ConditionTrue, v1beta1.InitializedReason, v1beta1.InitializedReason)
 		if err := r.patchStatus(ctx, req, provider.Status); err != nil {
 			return ctrl.Result{Requeue: true}, err
 		}

diff --git a/controllers/receiver_controller.go b/controllers/receiver_controller.go
@@ -85,7 +85,6 @@ func (r *ReceiverReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 		v1beta1.InitializedReason,
 		"Receiver initialised with URL: "+receiverURL,
 		receiverURL)
-	receiver.Status.ObservedGeneration = receiver.Generation
 	if err := r.patchStatus(ctx, req, receiver.Status); err != nil {
 		return ctrl.Result{Requeue: true}, err
 	}