@@ -16,7 +16,9 @@ import (
1616
1717 flowslatest "github.com/netobserv/network-observability-operator/api/flowcollector/v1beta2"
1818 "github.com/netobserv/network-observability-operator/internal/controller/consoleplugin"
19+ "github.com/netobserv/network-observability-operator/internal/controller/constants"
1920 "github.com/netobserv/network-observability-operator/internal/controller/ebpf"
21+ "github.com/netobserv/network-observability-operator/internal/controller/loki"
2022 "github.com/netobserv/network-observability-operator/internal/controller/reconcilers"
2123 "github.com/netobserv/network-observability-operator/internal/pkg/cleanup"
2224 "github.com/netobserv/network-observability-operator/internal/pkg/helper"
@@ -120,8 +122,8 @@ func (r *FlowCollectorReconciler) Reconcile(ctx context.Context, _ ctrl.Request)
120122func (r * FlowCollectorReconciler ) reconcile (ctx context.Context , clh * helper.Client , desired * flowslatest.FlowCollector ) error {
121123 ns := helper .GetNamespace (& desired .Spec )
122124 previousNamespace := r .status .GetDeployedNamespace (desired )
123- loki := helper .NewLokiConfig (& desired .Spec .Loki , ns )
124- reconcilersInfo := r .newCommonInfo (clh , ns , & loki )
125+ lokiConfig := helper .NewLokiConfig (& desired .Spec .Loki , ns )
126+ reconcilersInfo := r .newCommonInfo (clh , ns , & lokiConfig )
125127
126128 if err := r .checkFinalizer (ctx , desired ); err != nil {
127129 return err
@@ -162,11 +164,20 @@ func (r *FlowCollectorReconciler) reconcile(ctx context.Context, clh *helper.Cli
162164 }
163165
164166 // Console plugin
165- err := cpReconciler .Reconcile (ctx , desired )
166- if err != nil {
167+ if err := cpReconciler .Reconcile (ctx , desired ); err != nil {
167168 return r .status .Error ("ReconcileConsolePluginFailed" , err )
168169 }
169170
171+ lokiReconciler := loki .NewReconciler (reconcilersInfo .NewInstance (
172+ map [reconcilers.ImageRef ]string {
173+ reconcilers .MainImage : constants .LokiDevImage ,
174+ },
175+ r .status ,
176+ ))
177+ if err := lokiReconciler .Reconcile (ctx , desired ); err != nil {
178+ return r .status .Error ("ReconcileLokiFailed" , err )
179+ }
180+
170181 return nil
171182}
172183
0 commit comments