Skip to content

Fix ClusterParser/ClusterMultilineParser namespace filtering bug (#1778) #1779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcofranssen merged 2 commits into from
Nov 18, 2025
Merged

Fix ClusterParser/ClusterMultilineParser namespace filtering bug (#1778) #1779

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e75355d
Fix ClusterParser namespace filtering bug (#1778)
joshuabaird Nov 17, 2025
60fd08e
Fix linting errors.
joshuabaird Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 7 additions & 15 deletions controllers/fluentbitconfig_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ func (r *FluentBitConfigReconciler) processNamespacedFluentBitCfgs(
for _, cfg := range nsCfgs.Items {
filterList, outputList, parserList,
clusterParserList, multilineParsersList,
clusterMultilineParsersList, err := r.ListNamespacedResources(
clusterMultilineParsersList, err := r.ListFluentBitConfigResources(
ctx, cfg,
)
if err != nil {
Expand Down Expand Up @@ -299,7 +299,9 @@ func listNamespacedResources[T client.ObjectList](
return nil
}

func (r *FluentBitConfigReconciler) ListNamespacedResources(
// ListFluentBitConfigResources lists all resources (both namespaced and cluster-scoped)
// needed by the given FluentBitConfig.
func (r *FluentBitConfigReconciler) ListFluentBitConfigResources(
ctx context.Context, cfg fluentbitv1alpha2.FluentBitConfig,
) (
fluentbitv1alpha2.FilterList,
Expand All @@ -324,13 +326,7 @@ func (r *FluentBitConfigReconciler) ListNamespacedResources(
return filters, outputs, parsers, clusterParsers, multipleParsers, clusterMultipleParsers, err
}

if err := listNamespacedResources(
ctx,
r.Client,
&clusterParsers,
cfg.Namespace,
&cfg.Spec.ClusterParserSelector,
); err != nil {
if err := listClusterResources(ctx, r.Client, &cfg.Spec.ClusterParserSelector, &clusterParsers); err != nil {
return filters, outputs, parsers, clusterParsers, multipleParsers, clusterMultipleParsers, err
}

Expand All @@ -344,12 +340,8 @@ func (r *FluentBitConfigReconciler) ListNamespacedResources(
return filters, outputs, parsers, clusterParsers, multipleParsers, clusterMultipleParsers, err
}

if err := listNamespacedResources(
ctx,
r.Client,
&clusterMultipleParsers,
cfg.Namespace,
&cfg.Spec.ClusterMultilineParserSelector,
if err := listClusterResources(
ctx, r.Client, &cfg.Spec.ClusterMultilineParserSelector, &clusterMultipleParsers,
); err != nil {
return filters, outputs, parsers, clusterParsers, multipleParsers, clusterMultipleParsers, err
}
Expand Down
Loading