Merge pull request #531 from Mashimiao/fix-id-mappings

liangchenye · web-flow · commit deea452100c1 · 2017-12-13T11:03:07.000+08:00
Fix id mappings
diff --git a/validate/validate.go b/validate/validate.go
@@ -627,10 +627,6 @@ func (v *Validator) CheckLinux() (errs error) {
 
 	if (len(v.spec.Linux.UIDMappings) > 0 || len(v.spec.Linux.GIDMappings) > 0) && !nsTypeList[rspec.UserNamespace].newExist {
 		errs = multierror.Append(errs, errors.New("the UID/GID mappings requires a new User namespace to be specified as well"))
-	} else if len(v.spec.Linux.UIDMappings) > 5 {
-		errs = multierror.Append(errs, errors.New("only 5 UID mappings are allowed (linux kernel restriction)"))
-	} else if len(v.spec.Linux.GIDMappings) > 5 {
-		errs = multierror.Append(errs, errors.New("only 5 GID mappings are allowed (linux kernel restriction)"))
 	}
 
 	for k := range v.spec.Linux.Sysctl {

Original file line number	Diff line number	Diff line change
`@@ -627,10 +627,6 @@ func (v *Validator) CheckLinux() (errs error) {`
`627`	`627`
`628`	`628`	`if (len(v.spec.Linux.UIDMappings) > 0 \|\| len(v.spec.Linux.GIDMappings) > 0) && !nsTypeList[rspec.UserNamespace].newExist {`
`629`	`629`	`errs = multierror.Append(errs, errors.New("the UID/GID mappings requires a new User namespace to be specified as well"))`
`630`		`- } else if len(v.spec.Linux.UIDMappings) > 5 {`
`631`		`- errs = multierror.Append(errs, errors.New("only 5 UID mappings are allowed (linux kernel restriction)"))`
`632`		`- } else if len(v.spec.Linux.GIDMappings) > 5 {`
`633`		`- errs = multierror.Append(errs, errors.New("only 5 GID mappings are allowed (linux kernel restriction)"))`
`634`	`630`	`}`
`635`	`631`
`636`	`632`	`for k := range v.spec.Linux.Sysctl {`