From 50740a1a0ce283888853155272c5962e1d2e7076 Mon Sep 17 00:00:00 2001 From: Shingo Omura Date: Tue, 14 Mar 2023 13:33:17 +0900 Subject: [PATCH] use strings.Cut instead of strings.Split for parsing imageConfig.User Signed-off-by: Shingo Omura --- pkg/cri/sbserver/container_create_linux.go | 3 +-- pkg/cri/server/container_create_linux.go | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/cri/sbserver/container_create_linux.go b/pkg/cri/sbserver/container_create_linux.go index 2676a872b..57200441c 100644 --- a/pkg/cri/sbserver/container_create_linux.go +++ b/pkg/cri/sbserver/container_create_linux.go @@ -136,8 +136,7 @@ func (c *criService) containerSpecOpts(config *runtime.ContainerConfig, imageCon } else if securityContext.GetRunAsUser() != nil { userstr = strconv.FormatInt(securityContext.GetRunAsUser().GetValue(), 10) } else if imageConfig.User != "" { - parts := strings.Split(imageConfig.User, ":") - userstr = parts[0] + userstr, _, _ = strings.Cut(imageConfig.User, ":") } specOpts = append(specOpts, customopts.WithAdditionalGIDs(userstr), customopts.WithSupplementalGroups(securityContext.GetSupplementalGroups())) diff --git a/pkg/cri/server/container_create_linux.go b/pkg/cri/server/container_create_linux.go index 4a9e37394..d4206c654 100644 --- a/pkg/cri/server/container_create_linux.go +++ b/pkg/cri/server/container_create_linux.go @@ -372,8 +372,7 @@ func (c *criService) containerSpecOpts(config *runtime.ContainerConfig, imageCon } else if securityContext.GetRunAsUser() != nil { userstr = strconv.FormatInt(securityContext.GetRunAsUser().GetValue(), 10) } else if imageConfig.User != "" { - parts := strings.Split(imageConfig.User, ":") - userstr = parts[0] + userstr, _, _ = strings.Cut(imageConfig.User, ":") } specOpts = append(specOpts, customopts.WithAdditionalGIDs(userstr), customopts.WithSupplementalGroups(securityContext.GetSupplementalGroups()))