Browse Source

config: rename role 'endpoint' to 'endpoints'

pull/2040/head
Fabian Reinartz 8 years ago
parent
commit
1b6dfa32a9
  1. 4
      config/config.go
  2. 2
      config/testdata/conf.good.yml

4
config/config.go

@ -799,7 +799,7 @@ const (
KubernetesRoleNode = "node"
KubernetesRolePod = "pod"
KubernetesRoleService = "service"
KubernetesRoleEndpoint = "endpoint"
KubernetesRoleEndpoint = "endpoints"
)
func (c *KubernetesRole) UnmarshalYAML(unmarshal func(interface{}) error) error {
@ -839,7 +839,7 @@ func (c *KubernetesSDConfig) UnmarshalYAML(unmarshal func(interface{}) error) er
return err
}
if c.Role == "" {
return fmt.Errorf("role missing (one of: pod, service, endpoint, node)")
return fmt.Errorf("role missing (one of: pod, service, endpoints, node)")
}
if len(c.BearerToken) > 0 && len(c.BearerTokenFile) > 0 {
return fmt.Errorf("at most one of bearer_token & bearer_token_file must be configured")

2
config/testdata/conf.good.yml vendored

@ -115,7 +115,7 @@ scrape_configs:
- job_name: service-kubernetes
kubernetes_sd_configs:
- role: endpoint
- role: endpoints
api_server: 'https://localhost:1234'
basic_auth:

Loading…
Cancel
Save