Merge pull request #1542 from kube-logging/loggingroute-logging-problems

Updates in logging status problems for usability

Author: pepov

controllers/logging/logging_controller.go

@@ -219,18 +219,14 @@ func (r *LoggingReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 				logging.Spec.FluentbitSpec,
 				loggingDataProvider,
 				nameProvider,
-				nil,
+				nil, // Not implemented for the embedded fluentbit config
 			).Reconcile)
 		}
 	default:
 		if logging.Spec.FluentbitSpec != nil {
 			return ctrl.Result{}, errors.New("fluentbit has to be removed from the logging resource before the new FluentbitAgent can be reconciled")
 		}
 		l := log.WithName("fluentbit")
-		aps, err := r.loggingRoutes(ctx, logging.Name)
-		if err != nil {
-			return ctrl.Result{}, err
-		}
 		for _, f := range loggingResources.Fluentbits {
 			f := f
 			reconcilers = append(reconcilers, fluentbit.New(
@@ -241,7 +237,7 @@ func (r *LoggingReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 				&f.Spec,
 				loggingDataProvider,
 				fluentbit.NewStandaloneFluentbitNameProvider(&f),
-				aps,
+				loggingResources.LoggingRoutes,
 			).Reconcile)
 		}
 	}
@@ -278,21 +274,6 @@ func (r *LoggingReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 	return ctrl.Result{}, nil
 }
 
-func (r *LoggingReconciler) loggingRoutes(ctx context.Context, logging string) (aps []loggingv1beta1.LoggingRoute, err error) {
-	apList := &loggingv1beta1.LoggingRouteList{}
-	err = r.Client.List(ctx, apList)
-	if err != nil {
-		err = errors.WrapIf(err, "listing logging routes")
-		return
-	}
-	for _, ap := range apList.Items {
-		if ap.Spec.Source == logging {
-			aps = append(aps, ap)
-		}
-	}
-	return
-}
-
 func (r *LoggingReconciler) dynamicDefaults(ctx context.Context, log logr.Logger, logging loggingv1beta1.Logging) {
 	nodes := corev1.NodeList{}
 	if err := r.Client.List(ctx, &nodes); err != nil {

pkg/resources/model/reconciler.go

@@ -204,11 +204,17 @@ func NewValidationReconciler(
 		}
 
 		registerForPatching(&resources.Logging)
+		resources.Logging.Status.Problems = nil
+		resources.Logging.Status.WatchNamespaces = nil
 
 		if !resources.Logging.WatchAllNamespaces() {
 			resources.Logging.Status.WatchNamespaces = resources.WatchNamespaces
 		}
-		resources.Logging.Status.Problems = nil
+
+		if resources.Logging.Spec.WatchNamespaceSelector != nil &&
+			len(resources.Logging.Status.WatchNamespaces) == 0 {
+			resources.Logging.Status.Problems = append(resources.Logging.Status.Problems, "Defined watchNamespaceSelector did not match any namespaces")
+		}
 
 		loggingsForTheSameRef := make([]string, 0)
 		for _, l := range resources.AllLoggings {
@@ -257,6 +263,11 @@ func NewValidationReconciler(
 				}
 			}
 		}
+
+		if resources.Logging.Spec.FluentbitSpec != nil && len(resources.LoggingRoutes) > 0 {
+			resources.Logging.Status.Problems = append(resources.Logging.Status.Problems, "Logging routes are not supported for embedded fluentbit configs, please use a separate FluentbitAgent resource!")
+		}
+
 		slices.Sort(resources.Logging.Status.Problems)
 		resources.Logging.Status.ProblemsCount = len(resources.Logging.Status.Problems)
 

pkg/resources/model/repository.go

@@ -69,6 +69,9 @@ func (r LoggingResourceRepository) LoggingResourcesFor(ctx context.Context, logg
 	res.Fluentbits, err = r.FluentbitsFor(ctx, logging)
 	errs = errors.Append(errs, err)
 
+	res.LoggingRoutes, err = r.LoggingRoutesFor(ctx, logging)
+	errs = errors.Append(errs, err)
+
 	res.WatchNamespaces, err = UniqueWatchNamespaces(ctx, r.Client, &logging)
 	if err != nil {
 		errs = errors.Append(errs, err)
@@ -145,16 +148,17 @@ func (r LoggingResourceRepository) ClusterFlowsFor(ctx context.Context, logging
 		return nil, err
 	}
 
-	sort.Slice(list.Items, func(i, j int) bool {
-		return lessByNamespacedName(&list.Items[i], &list.Items[j])
-	})
-
 	var res []v1beta1.ClusterFlow
 	for _, i := range list.Items {
 		if i.Spec.LoggingRef == logging.Spec.LoggingRef {
 			res = append(res, i)
 		}
 	}
+
+	sort.Slice(res, func(i, j int) bool {
+		return lessByNamespacedName(&res[i], &res[j])
+	})
+
 	return res, nil
 }
 
@@ -164,16 +168,17 @@ func (r LoggingResourceRepository) ClusterOutputsFor(ctx context.Context, loggin
 		return nil, err
 	}
 
-	sort.Slice(list.Items, func(i, j int) bool {
-		return lessByNamespacedName(&list.Items[i], &list.Items[j])
-	})
-
 	var res []v1beta1.ClusterOutput
 	for _, i := range list.Items {
 		if i.Spec.LoggingRef == logging.Spec.LoggingRef {
 			res = append(res, i)
 		}
 	}
+
+	sort.Slice(res, func(i, j int) bool {
+		return lessByNamespacedName(&res[i], &res[j])
+	})
+
 	return res, nil
 }
 
@@ -183,16 +188,17 @@ func (r LoggingResourceRepository) FlowsInNamespaceFor(ctx context.Context, name
 		return nil, err
 	}
 
-	sort.Slice(list.Items, func(i, j int) bool {
-		return lessByNamespacedName(&list.Items[i], &list.Items[j])
-	})
-
 	var res []v1beta1.Flow
 	for _, i := range list.Items {
 		if i.Spec.LoggingRef == logging.Spec.LoggingRef {
 			res = append(res, i)
 		}
 	}
+
+	sort.Slice(res, func(i, j int) bool {
+		return lessByNamespacedName(&res[i], &res[j])
+	})
+
 	return res, nil
 }
 
@@ -202,16 +208,16 @@ func (r LoggingResourceRepository) OutputsInNamespaceFor(ctx context.Context, na
 		return nil, err
 	}
 
-	sort.Slice(list.Items, func(i, j int) bool {
-		return lessByNamespacedName(&list.Items[i], &list.Items[j])
-	})
-
 	var res []v1beta1.Output
 	for _, i := range list.Items {
 		if i.Spec.LoggingRef == logging.Spec.LoggingRef {
 			res = append(res, i)
 		}
 	}
+
+	sort.Slice(res, func(i, j int) bool {
+		return lessByNamespacedName(&res[i], &res[j])
+	})
 	return res, nil
 }
 
@@ -221,16 +227,16 @@ func (r LoggingResourceRepository) SyslogNGClusterFlowsFor(ctx context.Context,
 		return nil, err
 	}
 
-	sort.Slice(list.Items, func(i, j int) bool {
-		return lessByNamespacedName(&list.Items[i], &list.Items[j])
-	})
-
 	var res []v1beta1.SyslogNGClusterFlow
 	for _, i := range list.Items {
 		if i.Spec.LoggingRef == logging.Spec.LoggingRef {
 			res = append(res, i)
 		}
 	}
+
+	sort.Slice(res, func(i, j int) bool {
+		return lessByNamespacedName(&res[i], &res[j])
+	})
 	return res, nil
 }
 
@@ -240,16 +246,15 @@ func (r LoggingResourceRepository) SyslogNGClusterOutputsFor(ctx context.Context
 		return nil, err
 	}
 
-	sort.Slice(list.Items, func(i, j int) bool {
-		return lessByNamespacedName(&list.Items[i], &list.Items[j])
-	})
-
 	var res []v1beta1.SyslogNGClusterOutput
 	for _, i := range list.Items {
 		if i.Spec.LoggingRef == logging.Spec.LoggingRef {
 			res = append(res, i)
 		}
 	}
+	sort.Slice(res, func(i, j int) bool {
+		return lessByNamespacedName(&res[i], &res[j])
+	})
 	return res, nil
 }
 
@@ -259,16 +264,15 @@ func (r LoggingResourceRepository) SyslogNGFlowsInNamespaceFor(ctx context.Conte
 		return nil, err
 	}
 
-	sort.Slice(list.Items, func(i, j int) bool {
-		return lessByNamespacedName(&list.Items[i], &list.Items[j])
-	})
-
 	var res []v1beta1.SyslogNGFlow
 	for _, i := range list.Items {
 		if i.Spec.LoggingRef == logging.Spec.LoggingRef {
 			res = append(res, i)
 		}
 	}
+	sort.Slice(res, func(i, j int) bool {
+		return lessByNamespacedName(&res[i], &res[j])
+	})
 	return res, nil
 }
 
@@ -278,16 +282,15 @@ func (r LoggingResourceRepository) SyslogNGOutputsInNamespaceFor(ctx context.Con
 		return nil, err
 	}
 
-	sort.Slice(list.Items, func(i, j int) bool {
-		return lessByNamespacedName(&list.Items[i], &list.Items[j])
-	})
-
 	var res []v1beta1.SyslogNGOutput
 	for _, i := range list.Items {
 		if i.Spec.LoggingRef == logging.Spec.LoggingRef {
 			res = append(res, i)
 		}
 	}
+	sort.Slice(res, func(i, j int) bool {
+		return lessByNamespacedName(&res[i], &res[j])
+	})
 	return res, nil
 }
 
@@ -302,16 +305,15 @@ func (r LoggingResourceRepository) NodeAgentsFor(ctx context.Context, logging v1
 		return nil, err
 	}
 
-	sort.Slice(list.Items, func(i, j int) bool {
-		return lessByNamespacedName(&list.Items[i], &list.Items[j])
-	})
-
 	var res []v1beta1.NodeAgent
 	for _, i := range list.Items {
 		if i.Spec.LoggingRef == logging.Spec.LoggingRef {
 			res = append(res, i)
 		}
 	}
+	sort.Slice(res, func(i, j int) bool {
+		return lessByNamespacedName(&res[i], &res[j])
+	})
 	return res, nil
 }
 
@@ -321,16 +323,33 @@ func (r LoggingResourceRepository) FluentbitsFor(ctx context.Context, logging v1
 		return nil, err
 	}
 
-	sort.Slice(list.Items, func(i, j int) bool {
-		return lessByNamespacedName(&list.Items[i], &list.Items[j])
-	})
-
 	var res []v1beta1.FluentbitAgent
 	for _, i := range list.Items {
 		if i.Spec.LoggingRef == logging.Spec.LoggingRef {
 			res = append(res, i)
 		}
 	}
+	sort.Slice(res, func(i, j int) bool {
+		return lessByNamespacedName(&res[i], &res[j])
+	})
+	return res, nil
+}
+
+func (r LoggingResourceRepository) LoggingRoutesFor(ctx context.Context, logging v1beta1.Logging) ([]v1beta1.LoggingRoute, error) {
+	var list v1beta1.LoggingRouteList
+	if err := r.Client.List(ctx, &list); err != nil {
+		return nil, err
+	}
+
+	var res []v1beta1.LoggingRoute
+	for _, i := range list.Items {
+		if i.Spec.Source == logging.Spec.LoggingRef {
+			res = append(res, i)
+		}
+	}
+	sort.Slice(res, func(i, j int) bool {
+		return lessByNamespacedName(&res[i], &res[j])
+	})
 	return res, nil
 }
 

pkg/resources/model/resources.go

@@ -25,6 +25,7 @@ type LoggingResources struct {
 	SyslogNG        SyslogNGLoggingResources
 	NodeAgents      []v1beta1.NodeAgent
 	Fluentbits      []v1beta1.FluentbitAgent
+	LoggingRoutes   []v1beta1.LoggingRoute
 	WatchNamespaces []string
 }