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

Create pod infra container

Browse source 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
This commit is contained in:
Mrunal Patel 2016-08-15 15:00:43 -07:00
parent 9076527083
commit a26c0eb992
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
server/runtime.go
View file

@ -105,7 +105,6 @@ func (s *Server) CreatePodSandbox(ctx context.Context, req *pb.CreatePodSandboxR
g.AddAnnotation(k, v) g.AddAnnotation(k, v)
} }
// TODO: double check cgroupParent.
cgroupParent := req.GetConfig().GetLinux().GetCgroupParent() cgroupParent := req.GetConfig().GetLinux().GetCgroupParent()
if cgroupParent != "" { if cgroupParent != "" {
g.SetLinuxCgroupsPath(cgroupParent) g.SetLinuxCgroupsPath(cgroupParent)
@ -138,6 +137,18 @@ func (s *Server) CreatePodSandbox(ctx context.Context, req *pb.CreatePodSandboxR
return nil, err return nil, err
} }
containerName := name + "-infra"
container, err := oci.NewContainer(containerName, podSandboxDir, podSandboxDir, labels, name)
if err != nil {
return nil, err
}
if err := s.runtime.CreateContainer(container); err != nil {
return nil, err
}
s.addContainer(container)
return &pb.CreatePodSandboxResponse{PodSandboxId: &name}, nil return &pb.CreatePodSandboxResponse{PodSandboxId: &name}, nil
} }