Merge pull request #516 from k8s-infra-cherrypick-robot/cherry-pick-5…

…04-to-release-1.3

[release-1.3] fixed issue where the webhook doesn't recognize -next as an invalid label

pkg/webhook/storageclass.go

@@ -120,6 +120,7 @@ func applyV1StorageClassPatch(sc *storagev1.StorageClass) *v1.AdmissionResponse
 }
 
 func validateInstanceLabel(label string) bool {
-	regex, _ := regexp.Compile(`^[\p{Ll}0-9_-]{0,63}$`)
+	// https://cloud.google.com/filestore/docs/managing-labels#requirements
+	regex, _ := regexp.Compile(`^(([a-z][a-z0-9_-]{0,61})?[a-z0-9])?$`)
 	return regex.MatchString(label)
 }

pkg/webhook/storageclass_test.go

@@ -241,6 +241,21 @@ func TestValidateInstanceLabel(t *testing.T) {
 			label:   "abc-*",
 			isValid: false,
 		},
+		{
+			name:    "label start with none-letter",
+			label:   "-next",
+			isValid: false,
+		},
+		{
+			name:    "label start with number",
+			label:   "123",
+			isValid: false,
+		},
+		{
+			name:    "label end with none-letter",
+			label:   "next-",
+			isValid: false,
+		},
 	}
 
 	for _, tc := range testCases {