Add server side pod filtering support
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
This commit is contained in:
parent
01c8785ea4
commit
5e7d96bd6a
1 changed files with 41 additions and 2 deletions
|
@ -463,10 +463,46 @@ func (s *Server) PodSandboxStatus(ctx context.Context, req *pb.PodSandboxStatusR
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// filterSandbox returns whether passed container matches filtering criteria
|
||||||
|
func filterSandbox(p *pb.PodSandbox, filter *pb.PodSandboxFilter) bool {
|
||||||
|
if filter != nil {
|
||||||
|
if filter.State != nil {
|
||||||
|
if *p.State != *filter.State {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if filter.LabelSelector != nil {
|
||||||
|
sel := fields.SelectorFromSet(filter.LabelSelector)
|
||||||
|
if !sel.Matches(fields.Set(p.Labels)) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
// ListPodSandbox returns a list of SandBoxes.
|
// ListPodSandbox returns a list of SandBoxes.
|
||||||
func (s *Server) ListPodSandbox(context.Context, *pb.ListPodSandboxRequest) (*pb.ListPodSandboxResponse, error) {
|
func (s *Server) ListPodSandbox(ctx context.Context, req *pb.ListPodSandboxRequest) (*pb.ListPodSandboxResponse, error) {
|
||||||
var pods []*pb.PodSandbox
|
var pods []*pb.PodSandbox
|
||||||
|
var podList []*sandbox
|
||||||
for _, sb := range s.state.sandboxes {
|
for _, sb := range s.state.sandboxes {
|
||||||
|
podList = append(podList, sb)
|
||||||
|
}
|
||||||
|
|
||||||
|
filter := req.Filter
|
||||||
|
// Filter by pod id first.
|
||||||
|
if filter != nil {
|
||||||
|
if filter.Id != nil {
|
||||||
|
sb := s.getSandbox(*filter.Id)
|
||||||
|
if sb == nil {
|
||||||
|
podList = []*sandbox{}
|
||||||
|
} else {
|
||||||
|
podList = []*sandbox{sb}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, sb := range podList {
|
||||||
podInfraContainerName := sb.name + "-infra"
|
podInfraContainerName := sb.name + "-infra"
|
||||||
podInfraContainer := sb.getContainer(podInfraContainerName)
|
podInfraContainer := sb.getContainer(podInfraContainerName)
|
||||||
if podInfraContainer == nil {
|
if podInfraContainer == nil {
|
||||||
|
@ -493,8 +529,11 @@ func (s *Server) ListPodSandbox(context.Context, *pb.ListPodSandboxRequest) (*pb
|
||||||
Metadata: sb.metadata,
|
Metadata: sb.metadata,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Filter by other criteria such as state and labels.
|
||||||
|
if filterSandbox(pod, req.Filter) {
|
||||||
pods = append(pods, pod)
|
pods = append(pods, pod)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return &pb.ListPodSandboxResponse{
|
return &pb.ListPodSandboxResponse{
|
||||||
Items: pods,
|
Items: pods,
|
||||||
|
|
Loading…
Reference in a new issue