handle subscriptions whose tenants don't have a collector

Signed-off-by: Kristof Gyuracz <kristof.gyuracz@gmail.com>
kube-logging · Jan 31, 2024 · ccf519c · ccf519c
1 parent b08189a
commit ccf519c
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/internal/controller/telemetry/collector_controller.go b/internal/controller/telemetry/collector_controller.go
@@ -350,13 +350,17 @@ func (r *CollectorReconciler) SetupWithManager(mgr ctrl.Manager) error {
 				subscriptionsForTenant, subscriptionsToUpdate, err := r.getSubscriptionsForTenant(ctx, &tenant)
 				if err != nil {
 					logger.Error(errors.WithStack(err), "failed listing subscriptions for collector, notifying collector anyways")
-					requests = addCollectorRequest(requests, tenant.Status.Collector)
+					if tenant.Status.Collector != "" {
+						requests = addCollectorRequest(requests, tenant.Status.Collector)
+					}
 					continue TenantLoop
 				}
 
 				for _, s := range append(subscriptionsForTenant, subscriptionsToUpdate...) {
 					if s.Name == subscription.Name {
-						requests = addCollectorRequest(requests, tenant.Status.Collector)
+						if tenant.Status.Collector != "" {
+							requests = addCollectorRequest(requests, tenant.Status.Collector)
+						}
 						continue TenantLoop
 					}
 				}
@@ -365,7 +369,9 @@ func (r *CollectorReconciler) SetupWithManager(mgr ctrl.Manager) error {
 
 				for _, s := range subscriptionsToDisown {
 					if s.Name == subscription.Name {
-						requests = addCollectorRequest(requests, tenant.Status.Collector)
+						if tenant.Status.Collector != "" {
+							requests = addCollectorRequest(requests, tenant.Status.Collector)
+						}
 						continue TenantLoop
 					}
 				}