Merge pull request #8285 from ashumkin/label-selector
discovery/kubernetes: Fix valid label selector causing config error
This commit is contained in:
commit
611fa967cd
|
@ -6,3 +6,8 @@ scrape_configs:
|
|||
- role: "pod"
|
||||
label: "foo=bar"
|
||||
field: "metadata.status=Running"
|
||||
- role: pod
|
||||
selectors:
|
||||
- role: "pod"
|
||||
label: "foo in (bar,baz)"
|
||||
field: "metadata.status=Running"
|
||||
|
|
|
@ -33,6 +33,7 @@ import (
|
|||
"k8s.io/api/networking/v1beta1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/fields"
|
||||
"k8s.io/apimachinery/pkg/labels"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/watch"
|
||||
"k8s.io/client-go/kubernetes"
|
||||
|
@ -203,7 +204,7 @@ func (c *SDConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
|
|||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = fields.ParseSelector(selector.Label)
|
||||
_, err = labels.Parse(selector.Label)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue