Skip to content

fix: namespace filter #489

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: namespace filter #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f62a67
fix: don't list all namespaces if not needed for filtering
plaffitt Sep 24, 2025
6add068
chore: modernize some loops with slices.Contains
plaffitt Sep 24, 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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ require (
k8s.io/api v0.34.1
k8s.io/apimachinery v0.34.1
k8s.io/client-go v0.34.1
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
)

require (
Expand Down Expand Up @@ -78,7 +79,6 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
Expand Down
30 changes: 12 additions & 18 deletions internal/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"iter"
"log/slog"
"math/rand"
"slices"
"strings"
"time"

Expand All @@ -17,6 +18,7 @@ import (
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/client-go/util/flowcontrol"
slicesutils "k8s.io/utils/strings/slices"
)

// ConnectToKubernetesCluster : Try connect to a cluster from inside if path is empty,
Expand Down Expand Up @@ -109,6 +111,14 @@ func (exporter *Exporter) parseAllKubeObjects() ([]*certificateRef, []error) {
}

func (exporter *Exporter) listNamespacesToWatch() ([]string, error) {
if len(exporter.KubeIncludeNamespaces) > 0 &&
len(exporter.KubeIncludeNamespaceLabels) == 0 &&
len(exporter.KubeExcludeNamespaceLabels) == 0 {
return slicesutils.Filter(nil, exporter.KubeIncludeNamespaces, func(namespace string) bool {
return !slicesutils.Contains(exporter.KubeExcludeNamespaces, namespace)
}), nil
}

_, includedLabelsWithValue := exporter.prepareLabelFilters(exporter.KubeIncludeNamespaceLabels)
labelSelector := metav1.LabelSelector{MatchLabels: includedLabelsWithValue}
namespaces, err := exporter.kubeClient.CoreV1().Namespaces().List(context.Background(), metav1.ListOptions{
Expand All @@ -124,27 +134,11 @@ func (exporter *Exporter) listNamespacesToWatch() ([]string, error) {
func (exporter *Exporter) filterNamespaces(namespaces []v1.Namespace) []string {
filteredNamespaces := []*v1.Namespace{}
for _, namespace := range namespaces {
found := false
for _, includeNs := range exporter.KubeIncludeNamespaces {
if namespace.Name == includeNs {
found = true
break
}
}

if len(exporter.KubeIncludeNamespaces) > 0 && !found {
if len(exporter.KubeIncludeNamespaces) > 0 && !slices.Contains(exporter.KubeIncludeNamespaces, namespace.Name) {
continue
}

found = false
for _, excludeNs := range exporter.KubeExcludeNamespaces {
if namespace.Name == excludeNs {
found = true
break
}
}

if !found {
if !slices.Contains(exporter.KubeExcludeNamespaces, namespace.Name) {
filteredNamespaces = append(filteredNamespaces, &namespace)
}
}
Expand Down
Loading