github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #16068 from JanetKuo/increase-annotation-size-limit

Browse Source 
Increase the annotation size limit to 256k
This commit is contained in:
Filip Grzadkowski 2015-10-22 14:45:49 +02:00
commit 343f195042
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/validation/validation.go
View File

@ -60,7 +60,7 @@ var pdPartitionErrorMsg string = intervalErrorMsg(0, 255)
var portRangeErrorMsg string = intervalErrorMsg(0, 65536) var portRangeErrorMsg string = intervalErrorMsg(0, 65536)
var portNameErrorMsg string = fmt.Sprintf(`must be an IANA_SVC_NAME (at most 15 characters, matching regex %s, it must contain at least one letter [a-z], and hyphens cannot be adjacent to other hyphens): e.g. "http"`, validation.IdentifierNoHyphensBeginEndFmt) var portNameErrorMsg string = fmt.Sprintf(`must be an IANA_SVC_NAME (at most 15 characters, matching regex %s, it must contain at least one letter [a-z], and hyphens cannot be adjacent to other hyphens): e.g. "http"`, validation.IdentifierNoHyphensBeginEndFmt)
const totalAnnotationSizeLimitB int = 64 * (1 << 10) // 64 kB const totalAnnotationSizeLimitB int = 256 * (1 << 10) // 256 kB
func ValidateLabelName(labelName, fieldName string) errs.ValidationErrorList { func ValidateLabelName(labelName, fieldName string) errs.ValidationErrorList {
allErrs := errs.ValidationErrorList{} allErrs := errs.ValidationErrorList{}

12
pkg/api/validation/validation_test.go
View File

@ -191,10 +191,10 @@ func TestValidateAnnotations(t *testing.T) {
{"1234/5678": "bar"}, {"1234/5678": "bar"},
{"1.2.3.4/5678": "bar"}, {"1.2.3.4/5678": "bar"},
{"UpperCase123": "bar"}, {"UpperCase123": "bar"},
{"a": strings.Repeat("b", (64*1024)-1)}, {"a": strings.Repeat("b", totalAnnotationSizeLimitB-1)},
{ {
"a": strings.Repeat("b", (32*1024)-1), "a": strings.Repeat("b", totalAnnotationSizeLimitB/2-1),
"c": strings.Repeat("d", (32*1024)-1), "c": strings.Repeat("d", totalAnnotationSizeLimitB/2-1),
}, },
} }
for i := range successCases { for i := range successCases {
@ -221,10 +221,10 @@ func TestValidateAnnotations(t *testing.T) {
} }
} }
totalSizeErrorCases := []map[string]string{ totalSizeErrorCases := []map[string]string{
{"a": strings.Repeat("b", 64*1024)}, {"a": strings.Repeat("b", totalAnnotationSizeLimitB)},
{ {
"a": strings.Repeat("b", 32*1024), "a": strings.Repeat("b", totalAnnotationSizeLimitB/2),
"c": strings.Repeat("d", 32*1024), "c": strings.Repeat("d", totalAnnotationSizeLimitB/2),
}, },
} }
for i := range totalSizeErrorCases { for i := range totalSizeErrorCases {