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

Decouple kubernetes-dependent an non-dependent parts of server

Browse source 
Move non-kubernetes-dependent portions of server struct to libkpod.
So far, only the struct fields have been moved and not their dependent
functions

Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
This commit is contained in:
Ryan Cole 2017-07-17 08:25:32 -04:00
parent 4d6ff0b414
commit 64ad902480
24 changed files with 153 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

8
server/container_status.go
View file

@ -26,7 +26,7 @@ func (s *Server) ContainerStatus(ctx context.Context, req *pb.ContainerStatusReq
return nil, err
}
if err = s.runtime.UpdateStatus(c); err != nil {
if err = s.Runtime().UpdateStatus(c); err != nil {
return nil, err
}
s.containerStateToDisk(c)
@ -48,7 +48,7 @@ func (s *Server) ContainerStatus(ctx context.Context, req *pb.ContainerStatusReq
resp.Status.Mounts = mounts
imageName := c.Image()
status, err := s.storageImageServer.ImageStatus(s.imageContext, imageName)
status, err := s.StorageImageServer().ImageStatus(s.ImageContext(), imageName)
if err != nil {
return nil, err
}
@ -81,7 +81,7 @@ func (s *Server) ContainerStatus(ctx context.Context, req *pb.ContainerStatusReq
}
resp.Status.Image = &pb.ImageSpec{Image: imageName}
cState := s.runtime.ContainerStatus(c)
cState := s.Runtime().ContainerStatus(c)
rStatus := pb.ContainerState_CONTAINER_UNKNOWN
switch cState.Status {
@ -122,7 +122,7 @@ func (s *Server) ContainerStatus(ctx context.Context, req *pb.ContainerStatusReq
}
func (s *Server) getMounts(id string) ([]*pb.Mount, error) {
config, err := s.store.FromContainerDirectory(id, "config.json")
config, err := s.Store().FromContainerDirectory(id, "config.json")
if err != nil {
return nil, err
}