Merge pull request #57990 from krmayankk/disrupt

Automatic merge from submit-queue (batch tested with PRs 57973, 57990). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix RunAsUserId validation Use validation.IsValidUserID to properly check for valid UserId in RunAsUser field of SecurityContext. release-note NONE

Merge pull request #57990 from krmayankk/disrupt
d32624ab · Kubernetes Submit Queue · GitHub · bf111161 · eac49159 · d32624ab
Unverified Commit d32624ab authored Jan 25, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 25, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

validation.go pkg/apis/core/validation/validation.go +2 -2

validation_test.go pkg/apis/core/validation/validation_test.go +1 -1

No files found.
--- a/pkg/apis/core/validation/validation.go
+++ b/pkg/apis/core/validation/validation.go
@@ -4813,8 +4813,8 @@ func ValidateSecurityContext(sc *core.SecurityContext, fldPath *field.Path) fiel
 	}

 	if sc.RunAsUser != nil {
-		if *sc.RunAsUser < 0 {
-			allErrs = append(allErrs, field.Invalid(fldPath.Child("runAsUser"), *sc.RunAsUser, isNegativeErrorMsg))
+		for _, msg := range validation.IsValidUserID(*sc.RunAsUser) {
+			allErrs = append(allErrs, field.Invalid(fldPath.Child("runAsUser"), *sc.RunAsUser, msg))
 		}
 	}


--- a/pkg/apis/core/validation/validation_test.go
+++ b/pkg/apis/core/validation/validation_test.go
@@ -11752,7 +11752,7 @@ func TestValidateSecurityContext(t *testing.T) {
 		"negative RunAsUser": {
 			sc:          negativeRunAsUser,
 			errorType:   "FieldValueInvalid",
-			errorDetail: isNegativeErrorMsg,
+			errorDetail: "must be between",
 		},
 	}
 	for k, v := range errorCases {