Move merging fieldselectors into app/server.go and replace namespaceFitler with fieldSelectorFilter

Author: CatherineF-dev

internal/store/builder.go

@@ -62,8 +62,7 @@ type Builder struct {
 	customResourceClients         map[string]interface{}
 	vpaClient                     vpaclientset.Interface
 	namespaces                    options.NamespaceList
-	namespaceFilter               string
-	nodeNameFilter                string
+	fieldSelectorFilter           string
 	ctx                           context.Context
 	enabledResources              []string
 	familyGeneratorFilter         generator.FamilyGeneratorFilter
@@ -107,20 +106,27 @@ func (b *Builder) WithEnabledResources(r []string) error {
 	return nil
 }
 
-// WithNamespaces sets the namespaces property of a Builder.
-func (b *Builder) WithNamespaces(n options.NamespaceList, nsFilter string) {
-	b.namespaces = n
-	b.namespaceFilter = nsFilter
+// WithFieldSelectorFilter sets the fieldSelector property of a Builder.
+func (b *Builder) WithFieldSelectorFilter(fieldSelectorFilter string) {
+	b.fieldSelectorFilter = fieldSelectorFilter
 }
 
-// WithNodeName sets the nodename property of a Builder.
-func (b *Builder) WithNodeName(nodeNameFilter string) {
-	b.nodeNameFilter = nodeNameFilter
+// WithNamespaces sets the namespaces property of a Builder.
+func (b *Builder) WithNamespaces(n options.NamespaceList) {
+	b.namespaces = n
 }
 
-// MergeFieldSelector merges two fieldSelectors using AND operator.
-func (b *Builder) MergeFieldSelector(s1 string, s2 string) (string, error) {
-	return options.MergeFieldSelector(s1, s2)
+// MergeFieldSelector merges multiple fieldSelectors using AND operator.
+func (b *Builder) MergeFieldSelector(selectors []string) (string, error) {
+	var err error
+	merged := options.EmptyFieldSelector()
+	for _, s := range selectors {
+		merged, err = options.MergeFieldSelector(merged, s)
+		if err != nil {
+			return "", err
+		}
+	}
+	return merged, nil
 }
 
 // WithSharding sets the shard and totalShards property of a Builder.
@@ -478,12 +484,10 @@ func (b *Builder) buildStores(
 			familyHeaders,
 			composedMetricGenFuncs,
 		)
-		merged, err := b.MergeFieldSelector(b.namespaceFilter, b.nodeNameFilter)
-		if err != nil {
-			panic(fmt.Sprintf("Failed to merge fieldSelector %s and %s", b.namespaceFilter, b.nodeNameFilter))
+		if b.fieldSelectorFilter != "" {
+			klog.Infof("FieldSelector is used ", b.fieldSelectorFilter)
 		}
-		klog.Infof("FieldSelector is used ", merged)
-		listWatcher := listWatchFunc(b.kubeClient, v1.NamespaceAll, merged)
+		listWatcher := listWatchFunc(b.kubeClient, v1.NamespaceAll, b.fieldSelectorFilter)
 		b.startReflector(expectedType, store, listWatcher, useAPIServerCache)
 		return []cache.Store{store}
 	}
@@ -494,12 +498,10 @@ func (b *Builder) buildStores(
 			familyHeaders,
 			composedMetricGenFuncs,
 		)
-		merged, err := b.MergeFieldSelector(b.namespaceFilter, b.nodeNameFilter)
-		if err != nil {
-			panic(fmt.Sprintf("Failed to merge fieldSelector %s and %s", b.namespaceFilter, b.nodeNameFilter))
+		if b.fieldSelectorFilter != "" {
+			klog.Infof("FieldSelector is used ", b.fieldSelectorFilter)
 		}
-		klog.Infof("FieldSelector is used ", merged)
-		listWatcher := listWatchFunc(b.kubeClient, ns, merged)
+		listWatcher := listWatchFunc(b.kubeClient, ns, b.fieldSelectorFilter)
 		b.startReflector(expectedType, store, listWatcher, useAPIServerCache)
 		stores = append(stores, store)
 	}
@@ -529,12 +531,10 @@ func (b *Builder) buildCustomResourceStores(resourceName string,
 			familyHeaders,
 			composedMetricGenFuncs,
 		)
-		merged, err := b.MergeFieldSelector(b.namespaceFilter, b.nodeNameFilter)
-		if err != nil {
-			panic(fmt.Sprintf("Failed to merge fieldSelector %s and %s", b.namespaceFilter, b.nodeNameFilter))
+		if b.fieldSelectorFilter != "" {
+			klog.Infof("FieldSelector is used ", b.fieldSelectorFilter)
 		}
-		klog.Infof("FieldSelector is used ", merged)
-		listWatcher := listWatchFunc(customResourceClient, v1.NamespaceAll, merged)
+		listWatcher := listWatchFunc(customResourceClient, v1.NamespaceAll, b.fieldSelectorFilter)
 		b.startReflector(expectedType, store, listWatcher, useAPIServerCache)
 		return []cache.Store{store}
 	}
@@ -545,12 +545,8 @@ func (b *Builder) buildCustomResourceStores(resourceName string,
 			familyHeaders,
 			composedMetricGenFuncs,
 		)
-		merged, err := b.MergeFieldSelector(b.namespaceFilter, b.nodeNameFilter)
-		if err != nil {
-			panic(fmt.Sprintf("Failed to merge fieldSelector %s and %s", b.namespaceFilter, b.nodeNameFilter))
-		}
-		klog.Infof("FieldSelector is used ", merged)
-		listWatcher := listWatchFunc(customResourceClient, ns, merged)
+		klog.Infof("FieldSelector is used ", b.fieldSelectorFilter)
+		listWatcher := listWatchFunc(customResourceClient, ns, b.fieldSelectorFilter)
 		b.startReflector(expectedType, store, listWatcher, useAPIServerCache)
 		stores = append(stores, store)
 	}

pkg/app/server.go

@@ -106,8 +106,13 @@ func RunKubeStateMetrics(ctx context.Context, opts *options.Options, factories .
 
 	namespaces := opts.Namespaces.GetNamespaces()
 	nsFieldSelector := namespaces.GetExcludeNSFieldSelector(opts.NamespacesDenylist)
-	storeBuilder.WithNamespaces(namespaces, nsFieldSelector)
-	storeBuilder.WithNodeName(opts.NodeName.GetNodeNameFieldSelector())
+	nodeNameFieldSelector := opts.NodeName.GetNodeNameFieldSelector()
+	merged, err := storeBuilder.MergeFieldSelector([]string{nsFieldSelector, nodeNameFieldSelector})
+	if err != nil {
+		return err
+	}
+	storeBuilder.WithNamespaces(namespaces)
+	storeBuilder.WithFieldSelectorFilter(merged)
 
 	allowDenyList, err := allowdenylist.New(opts.MetricAllowlist, opts.MetricDenylist)
 	if err != nil {

pkg/app/server_test.go

@@ -80,7 +80,7 @@ func BenchmarkKubeStateMetrics(b *testing.B) {
 	builder.WithKubeClient(kubeClient)
 	builder.WithSharding(0, 1)
 	builder.WithContext(ctx)
-	builder.WithNamespaces(options.DefaultNamespaces, "")
+	builder.WithNamespaces(options.DefaultNamespaces)
 	builder.WithGenerateStoresFunc(builder.DefaultGenerateStoresFunc())
 
 	allowDenyListFilter, err := allowdenylist.New(map[string]struct{}{}, map[string]struct{}{})
@@ -155,7 +155,7 @@ func TestFullScrapeCycle(t *testing.T) {
 		t.Fatal(err)
 	}
 	builder.WithKubeClient(kubeClient)
-	builder.WithNamespaces(options.DefaultNamespaces, "")
+	builder.WithNamespaces(options.DefaultNamespaces)
 	builder.WithGenerateStoresFunc(builder.DefaultGenerateStoresFunc())
 
 	l, err := allowdenylist.New(map[string]struct{}{}, map[string]struct{}{})
@@ -442,7 +442,7 @@ func TestShardingEquivalenceScrapeCycle(t *testing.T) {
 		t.Fatal(err)
 	}
 	unshardedBuilder.WithKubeClient(kubeClient)
-	unshardedBuilder.WithNamespaces(options.DefaultNamespaces, "")
+	unshardedBuilder.WithNamespaces(options.DefaultNamespaces)
 	unshardedBuilder.WithFamilyGeneratorFilter(l)
 	unshardedBuilder.WithAllowLabels(map[string][]string{})
 	unshardedBuilder.WithGenerateStoresFunc(unshardedBuilder.DefaultGenerateStoresFunc())
@@ -458,7 +458,7 @@ func TestShardingEquivalenceScrapeCycle(t *testing.T) {
 		t.Fatal(err)
 	}
 	shardedBuilder1.WithKubeClient(kubeClient)
-	shardedBuilder1.WithNamespaces(options.DefaultNamespaces, "")
+	shardedBuilder1.WithNamespaces(options.DefaultNamespaces)
 	shardedBuilder1.WithFamilyGeneratorFilter(l)
 	shardedBuilder1.WithAllowLabels(map[string][]string{})
 	shardedBuilder1.WithGenerateStoresFunc(shardedBuilder1.DefaultGenerateStoresFunc())
@@ -474,7 +474,7 @@ func TestShardingEquivalenceScrapeCycle(t *testing.T) {
 		t.Fatal(err)
 	}
 	shardedBuilder2.WithKubeClient(kubeClient)
-	shardedBuilder2.WithNamespaces(options.DefaultNamespaces, "")
+	shardedBuilder2.WithNamespaces(options.DefaultNamespaces)
 	shardedBuilder2.WithFamilyGeneratorFilter(l)
 	shardedBuilder2.WithAllowLabels(map[string][]string{})
 	shardedBuilder2.WithGenerateStoresFunc(shardedBuilder2.DefaultGenerateStoresFunc())
@@ -616,7 +616,7 @@ func TestCustomResourceExtension(t *testing.T) {
 
 	builder.WithKubeClient(kubeClient)
 	builder.WithCustomResourceClients(customResourceClients)
-	builder.WithNamespaces(options.DefaultNamespaces, "")
+	builder.WithNamespaces(options.DefaultNamespaces)
 	builder.WithGenerateStoresFunc(builder.DefaultGenerateStoresFunc())
 	builder.WithGenerateCustomResourceStoresFunc(builder.DefaultGenerateCustomResourceStoresFunc())
 

pkg/builder/builder.go

@@ -58,8 +58,8 @@ func (b *Builder) WithEnabledResources(c []string) error {
 }
 
 // WithNamespaces sets the namespaces property of a Builder.
-func (b *Builder) WithNamespaces(n options.NamespaceList, nsFilter string) {
-	b.internal.WithNamespaces(n, nsFilter)
+func (b *Builder) WithNamespaces(n options.NamespaceList) {
+	b.internal.WithNamespaces(n)
 }
 
 // WithSharding sets the shard and totalShards property of a Builder.

pkg/builder/types/interfaces.go

@@ -35,7 +35,8 @@ import (
 type BuilderInterface interface {
 	WithMetrics(r prometheus.Registerer)
 	WithEnabledResources(c []string) error
-	WithNamespaces(n options.NamespaceList, nsFilter string)
+	WithNamespaces(n options.NamespaceList)
+	WithFieldSelectorFilter(fieldSelectors string)
 	WithSharding(shard int32, totalShards int)
 	WithContext(ctx context.Context)
 	WithKubeClient(c clientset.Interface)

pkg/options/types.go

@@ -115,15 +115,20 @@ func (n *NodeNameType) GetNodeNameFieldSelector() string {
 	return fields.Nothing().String()
 }
 
+// EmptyFieldSelector returns an empty field selector.
+func EmptyFieldSelector() string {
+	return fields.Nothing().String()
+}
+
 // MergeFieldSelector returns AND of two field selectors.
 func MergeFieldSelector(s1 string, s2 string) (string, error) {
 	selector1, err := fields.ParseSelector(s1)
 	if err != nil {
-		return fields.Nothing().String(), err
+		return EmptyFieldSelector(), err
 	}
 	selector2, err := fields.ParseSelector(s2)
 	if err != nil {
-		return fields.Nothing().String(), err
+		return EmptyFieldSelector(), err
 	}
 	if selector1.Empty() {
 		return selector2.String(), nil