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

apply comments

Browse Source
This commit is contained in:
gmarek
2015-03-02 14:41:13 +01:00
parent 726a5af075
commit bb8a4f5ed3
6 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/util/validation.go
View File

@@ -20,7 +20,7 @@ import (
"regexp"
)
const LabelValueFmt string = "[A-Za-z0-9_\\-\\.,]*"
const LabelValueFmt string = "[-A-Za-z0-9_.]*"
var labelValueRegexp = regexp.MustCompile("^" + LabelValueFmt + "$")
@@ -30,17 +30,15 @@ func IsValidLabelValue(value string) bool {
return (len(value) <= LabelValueMaxLength && labelValueRegexp.MatchString(value))
}
const AnnotationValueFmt string = ".*"
var annotationValueRegexp = regexp.MustCompile("^" + AnnotationValueFmt + "$")
const TotalAnnotationSizeB int = 64 * (1 << 10) // 64 kB
// Annotation values are opaque.
func IsValidAnnotationValue(value string) bool {
return annotationValueRegexp.MatchString(value)
return true
}
const QualifiedNameFmt string = "([A-Za-z0-9_\\-\\.]+/)?[A-Za-z0-9_\\-\\.]*[A-Za-z0-9]"
const kubeToken string = "[A-Za-z0-9]"
const extendedKubeToken string = "[-A-Za-z0-9_.]"
const qualifiedNamePiece string = "(" + kubeToken + extendedKubeToken + "*)?" + kubeToken
const QualifiedNameFmt string = "(" + qualifiedNamePiece + "/)?" + qualifiedNamePiece
var qualifiedNameRegexp = regexp.MustCompile("^" + QualifiedNameFmt + "$")