From e36121ae9ba6f8c969ce7414eaff9de99b9f9f8e Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Wed, 21 Oct 2015 15:22:47 -0700 Subject: [PATCH] Increase the annotation size limit to 256k --- pkg/api/validation/validation.go | 2 +- pkg/api/validation/validation_test.go | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/api/validation/validation.go b/pkg/api/validation/validation.go index c778d85f3eb..e270f8364c7 100644 --- a/pkg/api/validation/validation.go +++ b/pkg/api/validation/validation.go @@ -60,7 +60,7 @@ var pdPartitionErrorMsg string = intervalErrorMsg(0, 255) 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) -const totalAnnotationSizeLimitB int = 64 * (1 << 10) // 64 kB +const totalAnnotationSizeLimitB int = 256 * (1 << 10) // 256 kB func ValidateLabelName(labelName, fieldName string) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} diff --git a/pkg/api/validation/validation_test.go b/pkg/api/validation/validation_test.go index ca7b8d7bf0d..b288e2da1ff 100644 --- a/pkg/api/validation/validation_test.go +++ b/pkg/api/validation/validation_test.go @@ -191,10 +191,10 @@ func TestValidateAnnotations(t *testing.T) { {"1234/5678": "bar"}, {"1.2.3.4/5678": "bar"}, {"UpperCase123": "bar"}, - {"a": strings.Repeat("b", (64*1024)-1)}, + {"a": strings.Repeat("b", totalAnnotationSizeLimitB-1)}, { - "a": strings.Repeat("b", (32*1024)-1), - "c": strings.Repeat("d", (32*1024)-1), + "a": strings.Repeat("b", totalAnnotationSizeLimitB/2-1), + "c": strings.Repeat("d", totalAnnotationSizeLimitB/2-1), }, } for i := range successCases { @@ -221,10 +221,10 @@ func TestValidateAnnotations(t *testing.T) { } } totalSizeErrorCases := []map[string]string{ - {"a": strings.Repeat("b", 64*1024)}, + {"a": strings.Repeat("b", totalAnnotationSizeLimitB)}, { - "a": strings.Repeat("b", 32*1024), - "c": strings.Repeat("d", 32*1024), + "a": strings.Repeat("b", totalAnnotationSizeLimitB/2), + "c": strings.Repeat("d", totalAnnotationSizeLimitB/2), }, } for i := range totalSizeErrorCases {