feat: treat no matching instances as error (#2113)

theSuess · web-flow · commit 156da2dffa89 · 2025-07-29T11:37:05.000Z
diff --git a/controllers/alertrulegroup_controller.go b/controllers/alertrulegroup_controller.go
@@ -107,7 +107,7 @@ func (r *GrafanaAlertRuleGroupReconciler) Reconcile(ctx context.Context, req ctr
 		setNoMatchingInstancesCondition(&group.Status.Conditions, group.Generation, err)
 		meta.RemoveStatusCondition(&group.Status.Conditions, conditionAlertGroupSynchronized)
 
-		return ctrl.Result{RequeueAfter: RequeueDelay}, nil
+		return ctrl.Result{}, ErrNoMatchingInstances
 	}
 
 	removeNoMatchingInstance(&group.Status.Conditions)
diff --git a/controllers/alertrulegroup_controller_test.go b/controllers/alertrulegroup_controller_test.go
@@ -54,6 +54,7 @@ var _ = Describe("AlertRulegroup Reconciler: Provoke Conditions", func() {
 			},
 			wantCondition: conditionNoMatchingInstance,
 			wantReason:    conditionReasonEmptyAPIReply,
+			wantErr:       ErrNoMatchingInstances.Error(),
 		},
 		{
 			name: "Failed to apply to instance",
diff --git a/controllers/contactpoint_controller.go b/controllers/contactpoint_controller.go
@@ -104,7 +104,7 @@ func (r *GrafanaContactPointReconciler) Reconcile(ctx context.Context, req ctrl.
 		setNoMatchingInstancesCondition(&contactPoint.Status.Conditions, contactPoint.Generation, err)
 		meta.RemoveStatusCondition(&contactPoint.Status.Conditions, conditionContactPointSynchronized)
 
-		return ctrl.Result{RequeueAfter: RequeueDelay}, nil
+		return ctrl.Result{}, ErrNoMatchingInstances
 	}
 
 	removeNoMatchingInstance(&contactPoint.Status.Conditions)
diff --git a/controllers/contactpoint_controller_test.go b/controllers/contactpoint_controller_test.go
@@ -44,6 +44,7 @@ var _ = Describe("ContactPoint Reconciler: Provoke Conditions", func() {
 			},
 			wantCondition: conditionNoMatchingInstance,
 			wantReason:    conditionReasonEmptyAPIReply,
+			wantErr:       ErrNoMatchingInstances.Error(),
 		},
 		{
 			name: "Failed to apply to instance",
diff --git a/controllers/controller_shared.go b/controllers/controller_shared.go
@@ -50,6 +50,8 @@ const (
 	grafanaFinalizer = "operator.grafana.com/finalizer"
 )
 
+var ErrNoMatchingInstances = fmt.Errorf("no matching instances")
+
 //+kubebuilder:rbac:groups=coordination.k8s.io,resources=leases,verbs=get;list;watch;create;update;patch;delete
 
 // Allow slower initial retry on any failure
diff --git a/controllers/dashboard_controller.go b/controllers/dashboard_controller.go
@@ -132,7 +132,7 @@ func (r *GrafanaDashboardReconciler) Reconcile(ctx context.Context, req ctrl.Req
 		meta.RemoveStatusCondition(&cr.Status.Conditions, conditionDashboardSynchronized)
 		cr.Status.NoMatchingInstances = true
 
-		return ctrl.Result{RequeueAfter: RequeueDelay}, nil
+		return ctrl.Result{}, ErrNoMatchingInstances
 	}
 
 	removeNoMatchingInstance(&cr.Status.Conditions)
diff --git a/controllers/dashboard_controller_test.go b/controllers/dashboard_controller_test.go
@@ -55,6 +55,7 @@ var _ = Describe("Dashboard Reconciler: Provoke Conditions", func() {
 			},
 			wantCondition: conditionNoMatchingInstance,
 			wantReason:    conditionReasonEmptyAPIReply,
+			wantErr:       ErrNoMatchingInstances.Error(),
 		},
 		{
 			name: "Failed to apply to instance",
diff --git a/controllers/datasource_controller.go b/controllers/datasource_controller.go
@@ -109,7 +109,7 @@ func (r *GrafanaDatasourceReconciler) Reconcile(ctx context.Context, req ctrl.Re
 		meta.RemoveStatusCondition(&cr.Status.Conditions, conditionDatasourceSynchronized)
 		cr.Status.NoMatchingInstances = true
 
-		return ctrl.Result{RequeueAfter: RequeueDelay}, nil
+		return ctrl.Result{}, ErrNoMatchingInstances
 	}
 
 	removeNoMatchingInstance(&cr.Status.Conditions)
diff --git a/controllers/datasource_controller_test.go b/controllers/datasource_controller_test.go
@@ -203,6 +203,7 @@ var _ = Describe("Datasource Reconciler: Provoke Conditions", func() {
 			},
 			wantCondition: conditionNoMatchingInstance,
 			wantReason:    conditionReasonEmptyAPIReply,
+			wantErr:       ErrNoMatchingInstances.Error(),
 		},
 		{
 			name: "Failed to apply to instance",
diff --git a/controllers/folder_controller.go b/controllers/folder_controller.go
@@ -116,7 +116,7 @@ func (r *GrafanaFolderReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		meta.RemoveStatusCondition(&folder.Status.Conditions, conditionFolderSynchronized)
 		folder.Status.NoMatchingInstances = true
 
-		return ctrl.Result{RequeueAfter: RequeueDelay}, nil
+		return ctrl.Result{}, ErrNoMatchingInstances
 	}
 
 	removeNoMatchingInstance(&folder.Status.Conditions)
diff --git a/controllers/folder_controller_test.go b/controllers/folder_controller_test.go
@@ -36,6 +36,7 @@ var _ = Describe("Folder Reconciler: Provoke Conditions", func() {
 			},
 			wantCondition: conditionNoMatchingInstance,
 			wantReason:    conditionReasonEmptyAPIReply,
+			wantErr:       ErrNoMatchingInstances.Error(),
 		},
 		{
 			name: "Failed to apply to instance",
diff --git a/controllers/librarypanel_controller.go b/controllers/librarypanel_controller.go
@@ -145,7 +145,7 @@ func (r *GrafanaLibraryPanelReconciler) Reconcile(ctx context.Context, req ctrl.
 		setNoMatchingInstancesCondition(&libraryPanel.Status.Conditions, libraryPanel.Generation, err)
 		meta.RemoveStatusCondition(&libraryPanel.Status.Conditions, conditionLibraryPanelSynchronized)
 
-		return ctrl.Result{RequeueAfter: RequeueDelay}, nil
+		return ctrl.Result{}, ErrNoMatchingInstances
 	}
 
 	removeNoMatchingInstance(&libraryPanel.Status.Conditions)
diff --git a/controllers/librarypanel_controller_test.go b/controllers/librarypanel_controller_test.go
@@ -38,6 +38,7 @@ var _ = Describe("LibraryPanel Reconciler: Provoke Conditions", func() {
 			},
 			wantCondition: conditionNoMatchingInstance,
 			wantReason:    conditionReasonEmptyAPIReply,
+			wantErr:       ErrNoMatchingInstances.Error(),
 		},
 		{
 			name: "Failed to apply to instance",
diff --git a/controllers/mutetiming_controller.go b/controllers/mutetiming_controller.go
@@ -100,7 +100,7 @@ func (r *GrafanaMuteTimingReconciler) Reconcile(ctx context.Context, req ctrl.Re
 		setNoMatchingInstancesCondition(&muteTiming.Status.Conditions, muteTiming.Generation, err)
 		meta.RemoveStatusCondition(&muteTiming.Status.Conditions, conditionMuteTimingSynchronized)
 
-		return ctrl.Result{RequeueAfter: RequeueDelay}, nil
+		return ctrl.Result{}, ErrNoMatchingInstances
 	}
 
 	removeNoMatchingInstance(&muteTiming.Status.Conditions)
diff --git a/controllers/mutetiming_controller_test.go b/controllers/mutetiming_controller_test.go
@@ -52,6 +52,7 @@ var _ = Describe("MuteTiming Reconciler: Provoke Conditions", func() {
 			},
 			wantCondition: conditionNoMatchingInstance,
 			wantReason:    conditionReasonEmptyAPIReply,
+			wantErr:       ErrNoMatchingInstances.Error(),
 		},
 		{
 			name: "Failed to apply to instance",
diff --git a/controllers/notificationpolicy_controller.go b/controllers/notificationpolicy_controller.go
@@ -152,7 +152,7 @@ func (r *GrafanaNotificationPolicyReconciler) Reconcile(ctx context.Context, req
 		setNoMatchingInstancesCondition(&notificationPolicy.Status.Conditions, notificationPolicy.Generation, err)
 		meta.RemoveStatusCondition(&notificationPolicy.Status.Conditions, conditionNotificationPolicySynchronized)
 
-		return ctrl.Result{RequeueAfter: RequeueDelay}, nil
+		return ctrl.Result{}, ErrNoMatchingInstances
 	}
 
 	removeNoMatchingInstance(&notificationPolicy.Status.Conditions)
diff --git a/controllers/notificationpolicy_controller_test.go b/controllers/notificationpolicy_controller_test.go
@@ -413,6 +413,7 @@ var _ = Describe("NotificationPolicy Reconciler: Provoke Conditions", func() {
 			},
 			wantCondition: conditionNoMatchingInstance,
 			wantReason:    conditionReasonEmptyAPIReply,
+			wantErr:       ErrNoMatchingInstances.Error(),
 		},
 		{
 			name: "Failed to apply to instance",
diff --git a/controllers/notificationtemplate_controller.go b/controllers/notificationtemplate_controller.go
@@ -99,7 +99,7 @@ func (r *GrafanaNotificationTemplateReconciler) Reconcile(ctx context.Context, r
 		setNoMatchingInstancesCondition(&notificationTemplate.Status.Conditions, notificationTemplate.Generation, err)
 		meta.RemoveStatusCondition(&notificationTemplate.Status.Conditions, conditionNotificationTemplateSynchronized)
 
-		return ctrl.Result{RequeueAfter: RequeueDelay}, nil
+		return ctrl.Result{}, ErrNoMatchingInstances
 	}
 
 	removeNoMatchingInstance(&notificationTemplate.Status.Conditions)
diff --git a/controllers/notificationtemplate_controller_test.go b/controllers/notificationtemplate_controller_test.go
@@ -38,6 +38,7 @@ var _ = Describe("NotificationTemplate Reconciler: Provoke Conditions", func() {
 			},
 			wantCondition: conditionNoMatchingInstance,
 			wantReason:    conditionReasonEmptyAPIReply,
+			wantErr:       ErrNoMatchingInstances.Error(),
 		},
 		{
 			name: "Failed to apply to instance",

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func (r *GrafanaAlertRuleGroupReconciler) Reconcile(ctx context.Context, req ctr`
`107`	`107`	`setNoMatchingInstancesCondition(&group.Status.Conditions, group.Generation, err)`
`108`	`108`	`meta.RemoveStatusCondition(&group.Status.Conditions, conditionAlertGroupSynchronized)`
`109`	`109`
`110`		`- return ctrl.Result{RequeueAfter: RequeueDelay}, nil`
	`110`	`+ return ctrl.Result{}, ErrNoMatchingInstances`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`removeNoMatchingInstance(&group.Status.Conditions)`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ var _ = Describe("AlertRulegroup Reconciler: Provoke Conditions", func() {`
`54`	`54`	`},`
`55`	`55`	`wantCondition: conditionNoMatchingInstance,`
`56`	`56`	`wantReason: conditionReasonEmptyAPIReply,`
	`57`	`+ wantErr: ErrNoMatchingInstances.Error(),`
`57`	`58`	`},`
`58`	`59`	`{`
`59`	`60`	`name: "Failed to apply to instance",`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ func (r *GrafanaContactPointReconciler) Reconcile(ctx context.Context, req ctrl.`
`104`	`104`	`setNoMatchingInstancesCondition(&contactPoint.Status.Conditions, contactPoint.Generation, err)`
`105`	`105`	`meta.RemoveStatusCondition(&contactPoint.Status.Conditions, conditionContactPointSynchronized)`
`106`	`106`
`107`		`- return ctrl.Result{RequeueAfter: RequeueDelay}, nil`
	`107`	`+ return ctrl.Result{}, ErrNoMatchingInstances`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`removeNoMatchingInstance(&contactPoint.Status.Conditions)`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ var _ = Describe("ContactPoint Reconciler: Provoke Conditions", func() {`
`44`	`44`	`},`
`45`	`45`	`wantCondition: conditionNoMatchingInstance,`
`46`	`46`	`wantReason: conditionReasonEmptyAPIReply,`
	`47`	`+ wantErr: ErrNoMatchingInstances.Error(),`
`47`	`48`	`},`
`48`	`49`	`{`
`49`	`50`	`name: "Failed to apply to instance",`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,8 @@ const (`
`50`	`50`	`grafanaFinalizer = "operator.grafana.com/finalizer"`
`51`	`51`	`)`
`52`	`52`
	`53`	`+var ErrNoMatchingInstances = fmt.Errorf("no matching instances")`
	`54`	`+`
`53`	`55`	`//+kubebuilder:rbac:groups=coordination.k8s.io,resources=leases,verbs=get;list;watch;create;update;patch;delete`
`54`	`56`
`55`	`57`	`// Allow slower initial retry on any failure`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ func (r *GrafanaDashboardReconciler) Reconcile(ctx context.Context, req ctrl.Req`
`132`	`132`	`meta.RemoveStatusCondition(&cr.Status.Conditions, conditionDashboardSynchronized)`
`133`	`133`	`cr.Status.NoMatchingInstances = true`
`134`	`134`
`135`		`- return ctrl.Result{RequeueAfter: RequeueDelay}, nil`
	`135`	`+ return ctrl.Result{}, ErrNoMatchingInstances`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`removeNoMatchingInstance(&cr.Status.Conditions)`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ var _ = Describe("Dashboard Reconciler: Provoke Conditions", func() {`
`55`	`55`	`},`
`56`	`56`	`wantCondition: conditionNoMatchingInstance,`
`57`	`57`	`wantReason: conditionReasonEmptyAPIReply,`
	`58`	`+ wantErr: ErrNoMatchingInstances.Error(),`
`58`	`59`	`},`
`59`	`60`	`{`
`60`	`61`	`name: "Failed to apply to instance",`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ func (r *GrafanaDatasourceReconciler) Reconcile(ctx context.Context, req ctrl.Re`
`109`	`109`	`meta.RemoveStatusCondition(&cr.Status.Conditions, conditionDatasourceSynchronized)`
`110`	`110`	`cr.Status.NoMatchingInstances = true`
`111`	`111`
`112`		`- return ctrl.Result{RequeueAfter: RequeueDelay}, nil`
	`112`	`+ return ctrl.Result{}, ErrNoMatchingInstances`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`removeNoMatchingInstance(&cr.Status.Conditions)`
Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,7 @@ var _ = Describe("Datasource Reconciler: Provoke Conditions", func() {`
`203`	`203`	`},`
`204`	`204`	`wantCondition: conditionNoMatchingInstance,`
`205`	`205`	`wantReason: conditionReasonEmptyAPIReply,`
	`206`	`+ wantErr: ErrNoMatchingInstances.Error(),`
`206`	`207`	`},`
`207`	`208`	`{`
`208`	`209`	`name: "Failed to apply to instance",`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ func (r *GrafanaFolderReconciler) Reconcile(ctx context.Context, req ctrl.Reques`
`116`	`116`	`meta.RemoveStatusCondition(&folder.Status.Conditions, conditionFolderSynchronized)`
`117`	`117`	`folder.Status.NoMatchingInstances = true`
`118`	`118`
`119`		`- return ctrl.Result{RequeueAfter: RequeueDelay}, nil`
	`119`	`+ return ctrl.Result{}, ErrNoMatchingInstances`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`removeNoMatchingInstance(&folder.Status.Conditions)`