Fix: Invalid if condition in GetScopedMatchingInstances when only…

… 1 instance is unready (#1804) * fix: Invalid if condition * fix: r.Log is undefined resulting in missing logs * chore: Remove ResyncPeriodHasElapsed requirement on CommonResource
grafana · Dec 30, 2024 · 5296824 · 5296824
1 parent 4633e22
commit 5296824
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/api/v1beta1/common.go b/api/v1beta1/common.go
@@ -49,7 +49,6 @@ type CommonResource interface {
 	MatchLabels() *metav1.LabelSelector
 	MatchNamespace() string
 	AllowCrossNamespace() bool
-	ResyncPeriodHasElapsed() bool
 }
 
 // The most recent observed state of a Grafana resource

diff --git a/controllers/controller_shared.go b/controllers/controller_shared.go
@@ -102,7 +102,7 @@ func GetScopedMatchingInstances(log logr.Logger, ctx context.Context, k8sClient
 		}
 		selectedList = append(selectedList, instance)
 	}
-	if len(unready_instances) > 1 {
+	if len(unready_instances) > 0 {
 		log.Info("Grafana instances not ready", "instances", unready_instances)
 	}
 

diff --git a/controllers/grafana_controller.go b/controllers/grafana_controller.go
@@ -69,6 +69,7 @@ type GrafanaReconciler struct {
 
 func (r *GrafanaReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	controllerLog := log.FromContext(ctx).WithName("GrafanaReconciler")
+	r.Log = controllerLog
 
 	grafana := &grafanav1beta1.Grafana{}
 	err := r.Get(ctx, req.NamespacedName, grafana)