Update godeps

vendor/k8s.io/kubernetes/pkg/labels/deep_copy_generated.go

@@ -1,45 +0,0 @@
-// +build !ignore_autogenerated
-
-/*
-Copyright 2016 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// This file was autogenerated by deepcopy-gen. Do not edit it manually!
-
-package labels
-
-import (
-	conversion "k8s.io/kubernetes/pkg/conversion"
-	sets "k8s.io/kubernetes/pkg/util/sets"
-)
-
-func DeepCopy_labels_Requirement(in Requirement, out *Requirement, c *conversion.Cloner) error {
-	out.key = in.key
-	out.operator = in.operator
-	if in.strValues != nil {
-		in, out := in.strValues, &out.strValues
-		*out = make(sets.String)
-		for key, val := range in {
-			newVal := new(sets.Empty)
-			if err := sets.DeepCopy_sets_Empty(val, newVal, c); err != nil {
-				return err
-			}
-			(*out)[key] = *newVal
-		}
-	} else {
-		out.strValues = nil
-	}
-	return nil
-}

vendor/k8s.io/kubernetes/pkg/labels/selector.go

@@ -764,19 +764,16 @@ func parse(selector string) (internalSelector, error) {
 	return internalSelector(items), err
 }
 
-var qualifiedNameErrorMsg string = fmt.Sprintf(`must be a qualified name (at most %d characters, matching regex %s), with an optional DNS subdomain prefix (at most %d characters, matching regex %s) and slash (/): e.g. "MyName" or "example.com/MyName"`, validation.QualifiedNameMaxLength, validation.QualifiedNameFmt, validation.DNS1123SubdomainMaxLength, validation.DNS1123SubdomainFmt)
-var labelValueErrorMsg string = fmt.Sprintf(`must have at most %d characters, matching regex %s: e.g. "MyValue" or ""`, validation.LabelValueMaxLength, validation.LabelValueFmt)
-
 func validateLabelKey(k string) error {
-	if !validation.IsQualifiedName(k) {
-		return fmt.Errorf("invalid label key: %s", qualifiedNameErrorMsg)
+	if errs := validation.IsQualifiedName(k); len(errs) != 0 {
+		return fmt.Errorf("invalid label key %q: %s", k, strings.Join(errs, "; "))
 	}
 	return nil
 }
 
 func validateLabelValue(v string) error {
-	if !validation.IsValidLabelValue(v) {
-		return fmt.Errorf("invalid label value: %s", labelValueErrorMsg)
+	if errs := validation.IsValidLabelValue(v); len(errs) != 0 {
+		return fmt.Errorf("invalid label value: %q: %s", v, strings.Join(errs, "; "))
 	}
 	return nil
 }