Skip to content

Commit eea3440

Browse files
everpeacethaJeztah
everpeace
authored and
thaJeztah
committed
use strings.Cut instead of strings.Split for parsing imageConfig.User
Signed-off-by: Shingo Omura <[email protected]> (cherry picked from commit 50740a1) Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent eace671 commit eea3440

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

‎pkg/cri/sbserver/container_create_linux.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ func (c *criService) containerSpecOpts(config *runtime.ContainerConfig, imageCon
7979
} else if securityContext.GetRunAsUser() != nil {
8080
userstr = strconv.FormatInt(securityContext.GetRunAsUser().GetValue(), 10)
8181
} else if imageConfig.User != "" {
82-
parts := strings.Split(imageConfig.User, ":")
83-
userstr = parts[0]
82+
userstr, _, _ = strings.Cut(imageConfig.User, ":")
8483
}
8584
specOpts = append(specOpts, customopts.WithAdditionalGIDs(userstr),
8685
customopts.WithSupplementalGroups(securityContext.GetSupplementalGroups()))

‎pkg/cri/server/container_create_linux.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,7 @@ func (c *criService) containerSpecOpts(config *runtime.ContainerConfig, imageCon
372372
} else if securityContext.GetRunAsUser() != nil {
373373
userstr = strconv.FormatInt(securityContext.GetRunAsUser().GetValue(), 10)
374374
} else if imageConfig.User != "" {
375-
parts := strings.Split(imageConfig.User, ":")
376-
userstr = parts[0]
375+
userstr, _, _ = strings.Cut(imageConfig.User, ":")
377376
}
378377
specOpts = append(specOpts, customopts.WithAdditionalGIDs(userstr),
379378
customopts.WithSupplementalGroups(securityContext.GetSupplementalGroups()))

0 commit comments

Comments
 (0)