Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions src/backend/controllers/openapi/pod.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import (
"net/http"
"strings"

"k8s.io/apimachinery/pkg/labels"

"github.com/Qihoo360/wayne/src/backend/client"
"github.com/Qihoo360/wayne/src/backend/models"
"github.com/Qihoo360/wayne/src/backend/models/response"
Expand Down Expand Up @@ -79,13 +77,7 @@ func (c *OpenAPIController) GetPodInfo() {
return
}

label, err := labels.ConvertSelectorToLabelsMap(params.LabelSelector)
if err != nil {
c.AddErrorAndResponse(fmt.Sprintf("Invalid LabelSelector parameter: %v!", err), http.StatusBadRequest)
return
}

pods, err := pod.ListPod(manager.CacheFactory, "", label)
pods, err := pod.ListPodByLabelKey(manager.CacheFactory, "", params.LabelSelector)
if err != nil {
logs.Error(fmt.Sprintf("Failed to parse metadata: %s", err.Error()))
c.AddErrorAndResponse(fmt.Sprintf("Maybe a problematic k8s cluster(%s)!", params.Cluster), http.StatusInternalServerError)
Expand Down
18 changes: 18 additions & 0 deletions src/backend/resources/pod/pod.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,24 @@ func ListKubePod(indexer *client.CacheFactory, namespace string, label map[strin
return pods, nil
}

func ListPodByLabelKey(indexer *client.CacheFactory, namespace string, label string) ([]*Pod, error) {
podSelector := map[string]string{}
podList, err := ListKubePod(indexer, namespace, podSelector)
if err != nil {
return nil, err
}
pods := make([]*Pod, 0)
for _, pod := range podList {
if pod.Labels[label] != "" {
pods = append(pods, &Pod{
Labels: pod.Labels,
PodIp: pod.Status.PodIP,
})
}
}
return pods, nil
}

func GetPodsByStatefulset(indexer *client.CacheFactory, namespace, name string) ([]*Pod, error) {
podSelector := map[string]string{"app": name}
pods, err := ListKubePod(indexer, namespace, podSelector)
Expand Down