Merge pull request #566 from scydas/kube-state-metrics-namespaces

#546 add kube state metrics namespace command

Author: Iceber

pkg/kube_state_metrics/metrics_store.go

@@ -7,6 +7,7 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/klog/v2"
 	"k8s.io/kube-state-metrics/v2/pkg/allowdenylist"
 	"k8s.io/kube-state-metrics/v2/pkg/metric"
@@ -49,20 +50,43 @@ func (config *MetricsStoreBuilderConfig) New() (*MetricsStoreBuilder, error) {
 		return nil, nil
 	}
 
+	var match func(interface{}) (bool, error)
+	if len(config.NamespacesDenylist) != 0 {
+		set := sets.NewString(config.NamespacesDenylist...)
+		match = func(obj interface{}) (bool, error) {
+			typ, err := meta.Accessor(obj)
+			if err != nil {
+				return false, err
+			}
+			return !set.Has(typ.GetNamespace()), nil
+		}
+	} else if len(config.Namespaces) != 0 {
+		set := sets.NewString(config.Namespaces...)
+		match = func(obj interface{}) (bool, error) {
+			typ, err := meta.Accessor(obj)
+			if err != nil {
+				return false, err
+			}
+			return set.Has(typ.GetNamespace()), nil
+		}
+	}
+
 	filter, err := NewFamilyGeneratorFilter(config)
 	if err != nil {
 		return nil, err
 	}
 	return &MetricsStoreBuilder{
 		familyGeneratorFilter: filter,
 		resources:             config.Resources,
+		match:                 match,
 	}, nil
 }
 
 type MetricsStoreBuilder struct {
 	familyGeneratorFilter generator.FamilyGeneratorFilter
 
 	resources options.ResourceSet
+	match     func(obj interface{}) (bool, error)
 }
 
 func (builder *MetricsStoreBuilder) GetMetricStore(cluster string, resource schema.GroupVersionResource) *MetricsStore {
@@ -123,6 +147,7 @@ func (builder *MetricsStoreBuilder) GetMetricStore(cluster string, resource sche
 	return &MetricsStore{
 		MetricsStore: storage,
 		convertor:    convertor,
+		match:        builder.match,
 	}
 }
 
@@ -173,9 +198,20 @@ type MetricsStore struct {
 	*metricsstore.MetricsStore
 
 	convertor func(obj interface{}) (interface{}, error)
+	match     func(obj interface{}) (bool, error)
 }
 
 func (store *MetricsStore) Add(obj interface{}) error {
+	if store.match != nil {
+		matched, err := store.match(obj)
+		if err != nil {
+			return err
+		}
+		if !matched {
+			return nil
+		}
+	}
+
 	obj, err := store.convertor(obj)
 	if err != nil {
 		return err
@@ -185,6 +221,16 @@ func (store *MetricsStore) Add(obj interface{}) error {
 }
 
 func (store *MetricsStore) Update(obj interface{}) error {
+	if store.match != nil {
+		matched, err := store.match(obj)
+		if err != nil {
+			return err
+		}
+		if !matched {
+			return nil
+		}
+	}
+
 	obj, err := store.convertor(obj)
 	if err != nil {
 		return err
@@ -194,12 +240,31 @@ func (store *MetricsStore) Update(obj interface{}) error {
 }
 
 func (store *MetricsStore) Delete(obj interface{}) error {
+	if store.match != nil {
+		matched, err := store.match(obj)
+		if err != nil {
+			return err
+		}
+		if !matched {
+			return nil
+		}
+	}
+
 	return store.MetricsStore.Delete(obj)
 }
 
 func (store *MetricsStore) Replace(list []interface{}, rv string) error {
 	objs := make([]interface{}, 0, len(list))
 	for _, obj := range list {
+		if store.match != nil {
+			matched, err := store.match(obj)
+			if err != nil {
+				continue
+			}
+			if !matched {
+				continue
+			}
+		}
 		o, err := store.convertor(obj)
 		if err != nil {
 			return err

pkg/kube_state_metrics/options.go

@@ -45,8 +45,7 @@ func NewOptions() *Options {
 		MetricDenylist:  options.MetricSet{},
 		MetricOptInList: options.MetricSet{},
 
-		Resources:  defaultResources,
-		Namespaces: options.DefaultNamespaces,
+		Resources: defaultResources,
 	}
 }
 
@@ -79,11 +78,12 @@ func (o *Options) MetricsStoreBuilderConfig() *MetricsStoreBuilderConfig {
 		return nil
 	}
 	return &MetricsStoreBuilderConfig{
-		MetricAllowlist: o.MetricAllowlist,
-		MetricDenylist:  o.MetricDenylist,
-		MetricOptInList: o.MetricOptInList,
-		Resources:       o.Resources,
-		Namespaces:      o.Namespaces,
+		MetricAllowlist:    o.MetricAllowlist,
+		MetricDenylist:     o.MetricDenylist,
+		MetricOptInList:    o.MetricOptInList,
+		Resources:          o.Resources,
+		Namespaces:         o.Namespaces,
+		NamespacesDenylist: o.NamespacesDenylist,
 	}
 }