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

Merge pull request #57990 from krmayankk/disrupt

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2018-01-25 18:29:34 -08:00 committed by GitHub
commit d32624ab85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apis/core/validation/validation.go
View File

@ -4813,8 +4813,8 @@ func ValidateSecurityContext(sc *core.SecurityContext, fldPath *field.Path) fiel
} }
if sc.RunAsUser != nil { if sc.RunAsUser != nil {
if *sc.RunAsUser < 0 { for _, msg := range validation.IsValidUserID(*sc.RunAsUser) {
allErrs = append(allErrs, field.Invalid(fldPath.Child("runAsUser"), *sc.RunAsUser, isNegativeErrorMsg)) allErrs = append(allErrs, field.Invalid(fldPath.Child("runAsUser"), *sc.RunAsUser, msg))
} }
} }

2
pkg/apis/core/validation/validation_test.go
View File

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