fluentbit: enable FluentbitAgent resources by default

Signed-off-by: Peter Wilcsinszky <[email protected]>

Author: pepov

controllers/logging/logging_controller.go

@@ -434,11 +434,8 @@ func SetupLoggingWithManager(mgr ctrl.Manager, logger logr.Logger) *ctrl.Builder
 		logger.Info("processing NodeAgent CRDs is explicitly disabled (enable: ENABLE_NODEAGENT_CRD=1)")
 		builder.Watches(&source.Kind{Type: &loggingv1beta1.NodeAgent{}}, requestMapper)
 	}
-	// TODO remove with the next major release
-	if os.Getenv("ENABLE_FLUENTBIT_CRD") != "" {
-		logger.Info("processing FluentbitAgent CRDs is explicitly disabled (enable: ENABLE_FLUENTBIT_CRD=1)")
-		builder.Watches(&source.Kind{Type: &loggingv1beta1.FluentbitAgent{}}, requestMapper)
-	}
+
+	builder.Watches(&source.Kind{Type: &loggingv1beta1.FluentbitAgent{}}, requestMapper)
 
 	fluentd.RegisterWatches(builder)
 	fluentbit.RegisterWatches(builder)

pkg/resources/model/repository.go

@@ -282,11 +282,6 @@ func (r LoggingResourceRepository) NodeAgentsFor(ctx context.Context, logging v1
 }
 
 func (r LoggingResourceRepository) FluentbitsFor(ctx context.Context, logging v1beta1.Logging) ([]v1beta1.FluentbitAgent, error) {
-	if os.Getenv("ENABLE_FLUENTBIT_CRD") == "" {
-		r.Logger.Info("processing FluentbitAgent CRDs is explicitly disabled (enable: ENABLE_NODEAGENT_CRD=1)")
-		return nil, nil
-	}
-
 	var list v1beta1.FluentbitAgentList
 	if err := r.Client.List(ctx, &list); err != nil {
 		return nil, err