github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #11567 from klihub/fixes/2.0/ci-lint-errors

Browse Source 
[release/2.0] Fix CI lint error (cherry-picked #11555)
This commit is contained in:
Akihiro Suda 2025-03-19 22:49:23 +09:00 committed by GitHub
commit dcd661b138
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/oci/spec_opts.go
View File

@ -595,13 +595,13 @@ func WithUser(userstr string) SpecOpts {
setProcess(s) setProcess(s)
s.Process.User.AdditionalGids = nil s.Process.User.AdditionalGids = nil
// While the Linux kernel allows the max UID to be MaxUint32 - 2, // While the Linux kernel allows the max UID to be MaxUint32 - 2,
// and the OCI Runtime Spec has no definition about the max UID, // and the OCI Runtime Spec has no definition about the max UID,
// the runc implementation is known to require the UID to be <= MaxInt32. // the runc implementation is known to require the UID to be <= MaxInt32.
// //
// containerd follows runc's limitation here. // containerd follows runc's limitation here.
// //
// In future we may relax this limitation to allow MaxUint32 - 2, // In future we may relax this limitation to allow MaxUint32 - 2,
// or, amend the OCI Runtime Spec to codify the implementation limitation. // or, amend the OCI Runtime Spec to codify the implementation limitation.
const ( const (
minUserID = 0 minUserID = 0
maxUserID = math.MaxInt32 maxUserID = math.MaxInt32

1
pkg/oci/spec_opts_linux_test.go
View File

@ -105,7 +105,6 @@ guest:x:100:guest
}, },
} }
for _, testCase := range testCases { for _, testCase := range testCases {
testCase := testCase
t.Run(testCase.user, func(t *testing.T) { t.Run(testCase.user, func(t *testing.T) {
t.Parallel() t.Parallel()
s := Spec{ s := Spec{