github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27815 from mml/fed-validation

Browse Source 
Automatic merge from submit-queue

Report validation errors when command-line flag parsing fails.

Before this, I was stumped with

 invalid argument "federation=kubernetes-federation.test." for --federations=federation=kubernetes-federation.test.: federation not a valid federation name

but now

  invalid argument "federation=kubernetes-federation.test." for --federations=federation=kubernetes-federation.test.: federation not a valid federation name: ["must match the regex [a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)* (e.g. 'example.com')"]
This commit is contained in:
k8s-merge-robot
2016-06-21 16:56:08 -07:00
committed by GitHub
parent 1ea3b171d8 62c052bb6b
commit 2cb84fb6df
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/kube-dns/app/options/options.go
View File

@@ -112,13 +112,13 @@ func (fv federationsVar) Set(keyVal string) error {
splits := strings.SplitN(strings.TrimSpace(val), "=", 2)
name := strings.TrimSpace(splits[0])
domain := strings.TrimSpace(splits[1])
if len(validation.IsDNS1123Label(name)) != 0 {
return fmt.Errorf("%s not a valid federation name", name)
if errs := validation.IsDNS1123Label(name); len(errs) != 0 {
return fmt.Errorf("%q not a valid federation name: %q", name, errs)
}
// The federation domain name need not strictly be domain names, we
// accept valid dns names with subdomain components.
if len(validation.IsDNS1123Subdomain(domain)) != 0 {
return fmt.Errorf("%s not a valid federation name", name)
if errs := validation.IsDNS1123Subdomain(domain); len(errs) != 0 {
return fmt.Errorf("%q not a valid domain name: %q", domain, errs)
}
fv.nameDomainMap[name] = domain
}