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

use strings.Cut instead of strings.Split for parsing imageConfig.User

Browse Source 
Signed-off-by: Shingo Omura <everpeace@gmail.com>
This commit is contained in:
Shingo Omura 2023-03-14 13:33:17 +09:00
parent 727b254039
commit 50740a1a0c
No known key found for this signature in database
GPG Key ID: C4B9C73F26C783AF
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/cri/sbserver/container_create_linux.go
View File

@ -136,8 +136,7 @@ func (c *criService) containerSpecOpts(config *runtime.ContainerConfig, imageCon
} else if securityContext.GetRunAsUser() != nil { } else if securityContext.GetRunAsUser() != nil {
userstr = strconv.FormatInt(securityContext.GetRunAsUser().GetValue(), 10) userstr = strconv.FormatInt(securityContext.GetRunAsUser().GetValue(), 10)
} else if imageConfig.User != "" { } else if imageConfig.User != "" {
parts := strings.Split(imageConfig.User, ":") userstr, _, _ = strings.Cut(imageConfig.User, ":")
userstr = parts[0]
} }
specOpts = append(specOpts, customopts.WithAdditionalGIDs(userstr), specOpts = append(specOpts, customopts.WithAdditionalGIDs(userstr),
customopts.WithSupplementalGroups(securityContext.GetSupplementalGroups())) customopts.WithSupplementalGroups(securityContext.GetSupplementalGroups()))

3
pkg/cri/server/container_create_linux.go
View File

@ -372,8 +372,7 @@ func (c *criService) containerSpecOpts(config *runtime.ContainerConfig, imageCon
} else if securityContext.GetRunAsUser() != nil { } else if securityContext.GetRunAsUser() != nil {
userstr = strconv.FormatInt(securityContext.GetRunAsUser().GetValue(), 10) userstr = strconv.FormatInt(securityContext.GetRunAsUser().GetValue(), 10)
} else if imageConfig.User != "" { } else if imageConfig.User != "" {
parts := strings.Split(imageConfig.User, ":") userstr, _, _ = strings.Cut(imageConfig.User, ":")
userstr = parts[0]
} }
specOpts = append(specOpts, customopts.WithAdditionalGIDs(userstr), specOpts = append(specOpts, customopts.WithAdditionalGIDs(userstr),
customopts.WithSupplementalGroups(securityContext.GetSupplementalGroups())) customopts.WithSupplementalGroups(securityContext.GetSupplementalGroups()))