github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-13 11:25:19 +00:00
Code Issues Projects Releases Wiki Activity

Simplify List() signature in clients.

Browse Source
This commit is contained in:
Wojciech Tyczynski
2015-12-02 12:12:57 +01:00
parent 800012dfb8
commit 6dcb689d4e
141 changed files with 532 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/podautoscaler/metrics/metrics_client.go
View File

@@ -27,7 +27,6 @@ import (
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/unversioned"
client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
heapster "k8s.io/heapster/api/v1/types"
@@ -119,8 +118,9 @@ func (h *HeapsterMetricsClient) GetCPUUtilization(namespace string, selector map
}
func (h *HeapsterMetricsClient) GetResourceConsumptionAndRequest(resourceName api.ResourceName, namespace string, selector map[string]string) (consumption *ResourceConsumption, request *resource.Quantity, timestamp time.Time, err error) {
labelSelector := labels.SelectorFromSet(labels.Set(selector))
podList, err := h.client.Pods(namespace).
List(labels.SelectorFromSet(labels.Set(selector)), fields.Everything(), unversioned.ListOptions{})
List(unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{labelSelector}})
if err != nil {
return nil, nil, time.Time{}, fmt.Errorf("failed to get pod list: %v", err)