Fix discovery of fluentdconfig if migration mode is enabled

Signed-off-by: Jonas Rutishauser <jonas.rutishauser@css.ch>
vmware · Mar 16, 2023 · 6011334 · 6011334
1 parent 36d9fb5
commit 6011334
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/config-reloader/datasource/kube_informer.go b/config-reloader/datasource/kube_informer.go
@@ -88,6 +88,10 @@ func NewKubernetesInformerDatasource(ctx context.Context, cfg *config.Config, up
 			if err != nil {
 				return nil, err
 			}
+			fluentdconfigDSLister =
+				&kubedatasource.FluentdConfigDS{
+					Fdlist: kubeds.GetFdlist(),
+				}
 		} else {
 			kubeds, err = kubedatasource.NewConfigMapDS(ctx, cfg, factory, updateChan)
 			if err != nil {

diff --git a/config-reloader/datasource/kubedatasource/migrationmode.go b/config-reloader/datasource/kubedatasource/migrationmode.go
@@ -59,5 +59,5 @@ func (m *MigrationModeDS) GetFluentdConfig(ctx context.Context, namespace string
 
 // GetFdlist return nil for this mode because it does not use CRDs:
 func (m *MigrationModeDS) GetFdlist() kfoListersV1beta1.FluentdConfigLister {
-	return nil
+	return m.fdKubeDS.GetFdlist()
 }