vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

server: use grpc getters

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2017-09-13 13:06:05 +02:00
parent c1d158bba4
commit ec42a40936
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/container_create.go
View file

@ -304,11 +304,11 @@ func setupContainerUser(specgen *generate.Generator, rootfs string, sc *pb.Linux
if sc != nil { if sc != nil {
containerUser := "" containerUser := ""
// Case 1: run as user is set by kubelet // Case 1: run as user is set by kubelet
if sc.RunAsUser != nil { if sc.GetRunAsUser() != nil {
containerUser = strconv.FormatInt(sc.GetRunAsUser().Value, 10) containerUser = strconv.FormatInt(sc.GetRunAsUser().Value, 10)
} else { } else {
// Case 2: run as username is set by kubelet // Case 2: run as username is set by kubelet
userName := sc.RunAsUsername userName := sc.GetRunAsUsername()
if userName != "" { if userName != "" {
containerUser = userName containerUser = userName
} else { } else {
@ -338,7 +338,7 @@ func setupContainerUser(specgen *generate.Generator, rootfs string, sc *pb.Linux
} }
// Add groups from CRI // Add groups from CRI
groups := sc.SupplementalGroups groups := sc.GetSupplementalGroups()
for _, group := range groups { for _, group := range groups {
specgen.AddProcessAdditionalGid(uint32(group)) specgen.AddProcessAdditionalGid(uint32(group))
} }