Skip to content

Label selectors #768

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

Merged
inteon merged 5 commits into from
Feb 4, 2026
Merged

Label selectors #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
617f6e8
Add label selectors support to ConfigDynamic and validation tests
Feb 4, 2026
ad73686
Fix comment formatting in TestValidate_LabelSelectors function
Feb 4, 2026
2c332ff
Improve error handling for label selector parsing in newDataGathererW…
Feb 4, 2026
298dfbc
Clarify comment on label selector parsing in newDataGathererWithClient
Feb 4, 2026
8692cfc
improve unexpected error panic path
inteon Feb 4, 2026
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
45 changes: 40 additions & 5 deletions pkg/datagatherer/k8sdynamic/dynamic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/dynamic"
Expand Down Expand Up @@ -77,6 +78,8 @@ type ConfigDynamic struct {
IncludeNamespaces []string `yaml:"include-namespaces"`
// FieldSelectors is a list of field selectors to use when listing this resource
FieldSelectors []string `yaml:"field-selectors"`
// LabelSelectors is a list of label selectors to use when listing this resource
LabelSelectors []string `yaml:"label-selectors"`
}

// UnmarshalYAML unmarshals the ConfigDynamic resolving GroupVersionResource.
Expand All @@ -91,6 +94,7 @@ func (c *ConfigDynamic) UnmarshalYAML(unmarshal func(any) error) error {
ExcludeNamespaces []string `yaml:"exclude-namespaces"`
IncludeNamespaces []string `yaml:"include-namespaces"`
FieldSelectors []string `yaml:"field-selectors"`
LabelSelectors []string `yaml:"label-selectors"`
}{}
err := unmarshal(&aux)
if err != nil {
Expand All @@ -104,6 +108,7 @@ func (c *ConfigDynamic) UnmarshalYAML(unmarshal func(any) error) error {
c.ExcludeNamespaces = aux.ExcludeNamespaces
c.IncludeNamespaces = aux.IncludeNamespaces
c.FieldSelectors = aux.FieldSelectors
c.LabelSelectors = aux.LabelSelectors

return nil
}
Expand All @@ -119,16 +124,26 @@ func (c *ConfigDynamic) validate() error {
errs = append(errs, "invalid configuration: GroupVersionResource.Resource cannot be empty")
}

for i, selectorString := range c.FieldSelectors {
if selectorString == "" {
for i, fieldSelectorString := range c.FieldSelectors {
if fieldSelectorString == "" {
errs = append(errs, fmt.Sprintf("invalid field selector %d: must not be empty", i))
}
_, err := fields.ParseSelector(selectorString)
_, err := fields.ParseSelector(fieldSelectorString)
if err != nil {
errs = append(errs, fmt.Sprintf("invalid field selector %d: %s", i, err))
}
}

for i, labelSelectorString := range c.LabelSelectors {
if labelSelectorString == "" {
errs = append(errs, fmt.Sprintf("invalid label selector %d: must not be empty", i))
}
_, err := labels.Parse(labelSelectorString)
if err != nil {
errs = append(errs, fmt.Sprintf("invalid label selector %d: %s", i, err))
}
}

if len(errs) > 0 {
return errors.New(strings.Join(errs, ", "))
}
Expand Down Expand Up @@ -207,8 +222,22 @@ func (c *ConfigDynamic) newDataGathererWithClient(ctx context.Context, cl dynami
// Add any custom field selectors to the excluded namespaces selector
// The selectors have already been validated, so it is safe to use
// ParseSelectorOrDie here.
for _, selectorString := range c.FieldSelectors {
fieldSelector = fields.AndSelectors(fieldSelector, fields.ParseSelectorOrDie(selectorString))
for _, fieldSelectorString := range c.FieldSelectors {
fieldSelector = fields.AndSelectors(fieldSelector, fields.ParseSelectorOrDie(fieldSelectorString))
}

// Add any custom label selectors
// The selectors have already been validated, so Parse is expected to
// succeed; any parse error is treated as a programming error.
labelSelector := labels.Everything()
for _, labelSelectorString := range c.LabelSelectors {
selector, err := labels.Parse(labelSelectorString)
if err != nil {
panic(fmt.Sprintf("PROGRAMMING ERROR: should have been caught in validation: "+
"failed to parse validated label selector %q: %v", labelSelectorString, err))
}
reqs, _ := selector.Requirements()
labelSelector = labelSelector.Add(reqs...)
}

// init cache to store gathered resources
Expand All @@ -217,6 +246,7 @@ func (c *ConfigDynamic) newDataGathererWithClient(ctx context.Context, cl dynami
newDataGatherer := &DataGathererDynamic{
groupVersionResource: c.GroupVersionResource,
fieldSelector: fieldSelector.String(),
labelSelector: labelSelector.String(),
namespaces: c.IncludeNamespaces,
cache: dgCache,
}
Expand All @@ -237,6 +267,7 @@ func (c *ConfigDynamic) newDataGathererWithClient(ctx context.Context, cl dynami
informers.WithNamespace(metav1.NamespaceAll),
informers.WithTweakListOptions(func(options *metav1.ListOptions) {
options.FieldSelector = fieldSelector.String()
options.LabelSelector = labelSelector.String()
}),
)
newDataGatherer.informer = informerFunc(factory)
Expand All @@ -249,6 +280,7 @@ func (c *ConfigDynamic) newDataGathererWithClient(ctx context.Context, cl dynami
metav1.NamespaceAll,
func(options *metav1.ListOptions) {
options.FieldSelector = fieldSelector.String()
options.LabelSelector = labelSelector.String()
},
)
newDataGatherer.informer = factory.ForResource(c.GroupVersionResource).Informer()
Expand Down Expand Up @@ -293,6 +325,9 @@ type DataGathererDynamic struct {
// returned by the Kubernetes API.
// https://kubernetes.io/docs/concepts/overview/working-with-objects/field-selectors/
fieldSelector string
// labelSelector is a label selector string used to filter resources
// returned by the Kubernetes API.
labelSelector string
// cache holds all resources watched by the data gatherer, default object expiry time 5 minutes
// 30 seconds purge time https://pkg.go.dev/github.com/patrickmn/go-cache
cache *cache.Cache
Expand Down
Loading