From c55927384d0d090380d728c9953f40db33185375 Mon Sep 17 00:00:00 2001 From: Denis Khachyan Date: Thu, 15 Jun 2023 12:18:57 +0300 Subject: [PATCH] don not merge source if custom options exist --- controllers/factory/config/config_build.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/factory/config/config_build.go b/controllers/factory/config/config_build.go index d831c3e..f584523 100644 --- a/controllers/factory/config/config_build.go +++ b/controllers/factory/config/config_build.go @@ -327,7 +327,7 @@ func (b *Builder) mergeKubernetesSources(config *VectorConfig) error { routes := make(map[string]string) for _, source := range config.Sources { if source.Type == KubernetesSourceType { - if source.ExtraFieldSelector == "" && source.ExtraNamespaceLabelSelector != "" && source.ExtraLabelSelector != "" { + if source.ExtraFieldSelector == "" && source.ExtraNamespaceLabelSelector != "" && source.ExtraLabelSelector != "" && source.Options == nil { routes[source.Name] = generateVrlFilter(source.ExtraLabelSelector, PodSelectorType) + "&&" + generateVrlFilter(source.ExtraNamespaceLabelSelector, NamespaceSelectorType) continue }