Merge pull request #2000 from kube-logging/feat/fix-child-res-reconcile

fix(logging_controller): reconcile child resources

Author: csatib02

controllers/logging/logging_controller.go

@@ -31,6 +31,7 @@ import (
 	v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	"github.com/prometheus/client_golang/prometheus"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/tools/record"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -542,6 +543,38 @@ func SetupLoggingWithManager(mgr ctrl.Manager, logger logr.Logger) *ctrl.Builder
 			return nil
 		}
 
+		for _, ref := range obj.GetOwnerReferences() {
+			refGV, err := schema.ParseGroupVersion(ref.APIVersion)
+			if err != nil {
+				logger.Error(err, "failed to parse group version", "apiVersion", ref.APIVersion)
+				continue
+			}
+
+			const (
+				FluentbitAgentKind = "FluentbitAgent"
+				FluentdConfigKind  = "FluentdConfig"
+				SyslogNGConfigKind = "SyslogNGConfig"
+			)
+
+			// Check if this is owned by FluentbitAgent, FluentdConfig, or SyslogNGConfig
+			// and then map back to the relevant Logging resource
+			if refGV.Group == loggingv1beta1.GroupVersion.Group {
+				switch ref.Kind {
+				case FluentbitAgentKind:
+					var agent loggingv1beta1.FluentbitAgent
+					if err := mgr.GetClient().Get(ctx, types.NamespacedName{
+						Name:      ref.Name,
+						Namespace: obj.GetNamespace(),
+					}, &agent); err == nil {
+						return reconcileRequestsForLoggingRef(loggingList.Items, agent.Spec.LoggingRef)
+					}
+
+				case FluentdConfigKind, SyslogNGConfigKind:
+					return reconcileRequestsForMatchingControlNamespace(loggingList.Items, obj.GetNamespace())
+				}
+			}
+		}
+
 		switch o := obj.(type) {
 		case *loggingv1beta1.ClusterOutput:
 			return reconcileRequestsForLoggingRef(loggingList.Items, o.Spec.LoggingRef)

controllers/logging/telemetry_controller_controller.go

@@ -27,7 +27,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	telemetry_controller "github.com/kube-logging/logging-operator/pkg/resources/telemetry-controller"
-	"github.com/kube-logging/logging-operator/pkg/sdk/logging/api/v1beta1"
 	loggingv1beta1 "github.com/kube-logging/logging-operator/pkg/sdk/logging/api/v1beta1"
 )
 
@@ -160,7 +159,7 @@ func (r *TelemetryControllerReconciler) deleteTelemetryControllerResources(ctx c
 	return nil
 }
 
-func (r *TelemetryControllerReconciler) isAggregatorReady(ctx context.Context, logger logr.Logger, logging v1beta1.Logging) error {
+func (r *TelemetryControllerReconciler) isAggregatorReady(ctx context.Context, logger logr.Logger, logging loggingv1beta1.Logging) error {
 	logger.Info("Waiting for aggregator pod to be ready")
 
 	podName := fmt.Sprintf("%s-fluentd-0", logging.Name)