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

Merge pull request #110 from mrunalp/pod_meta

Browse source 
Return pod metadata in pod list and status APIs
This commit is contained in:
Antonio Murdaca 2016-10-07 20:44:40 +02:00 • committed by GitHub
commit 7c6eb77224
2 changed files with 65 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
server/sandbox.go
View file

@ -25,6 +25,7 @@ type sandbox struct {
containers oci.Store
processLabel string
mountLabel string
metadata *pb.PodSandboxMetadata
}
const (
@ -190,6 +191,7 @@ func (s *Server) RunPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
containers: oci.NewMemoryStore(),
processLabel: processLabel,
mountLabel: mountLabel,
metadata: req.GetConfig().GetMetadata(),
})
for k, v := range annotations {
@ -409,8 +411,11 @@ func (s *Server) PodSandboxStatus(ctx context.Context, req *pb.PodSandboxStatusR
Network: sPtr(netNsPath),
},
},
Network: &pb.PodSandboxNetworkStatus{Ip: &ip},
State: &rStatus,
Network: &pb.PodSandboxNetworkStatus{Ip: &ip},
State: &rStatus,
Labels: sb.labels,
Annotations: sb.annotations,
Metadata: sb.metadata,
},
}, nil
}
@ -437,9 +442,12 @@ func (s *Server) ListPodSandbox(context.Context, *pb.ListPodSandboxRequest) (*pb
}
pod := &pb.PodSandbox{
Id: &sb.id,
CreatedAt: int64Ptr(created),
State: &rStatus,
Id: &sb.id,
CreatedAt: int64Ptr(created),
State: &rStatus,
Labels: sb.labels,
Annotations: sb.annotations,
Metadata: sb.metadata,
}
pods = append(pods, pod)