Merge pull request #116 from kaasops/fix-source-merge

don not merge source if custom options exist
kaasops · Jun 15, 2023 · 5aa8871 · 5aa8871
2 parents bb0081a + c559273
commit 5aa8871
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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
 			}