vendor dependencies

This commit is contained in:
Sergiusz Urbaniak 2019-04-24 11:06:03 +02:00
parent 604208ef4f
commit 72abf135d6
1156 changed files with 78178 additions and 105799 deletions

View file

@ -19,10 +19,8 @@ import (
"fmt"
"time"
"github.com/golang/glog"
"github.com/kubernetes-incubator/metrics-server/pkg/provider"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -31,6 +29,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apiserver/pkg/registry/rest"
v1listers "k8s.io/client-go/listers/core/v1"
"k8s.io/klog"
"k8s.io/metrics/pkg/apis/metrics"
_ "k8s.io/metrics/pkg/apis/metrics/install"
)
@ -84,7 +83,7 @@ func (m *MetricStorage) List(ctx context.Context, options *metainternalversion.L
})
if err != nil {
errMsg := fmt.Errorf("Error while listing nodes for selector %v: %v", labelSelector, err)
glog.Error(errMsg)
klog.Error(errMsg)
return &metrics.NodeMetricsList{}, errMsg
}
@ -96,7 +95,7 @@ func (m *MetricStorage) List(ctx context.Context, options *metainternalversion.L
metricsItems, err := m.getNodeMetrics(names...)
if err != nil {
errMsg := fmt.Errorf("Error while fetching node metrics for selector %v: %v", labelSelector, err)
glog.Error(errMsg)
klog.Error(errMsg)
return &metrics.NodeMetricsList{}, errMsg
}
@ -109,7 +108,7 @@ func (m *MetricStorage) Get(ctx context.Context, name string, opts *metav1.GetOp
err = fmt.Errorf("no metrics known for node %q", name)
}
if err != nil {
glog.Errorf("unable to fetch node metrics for node %q: %v", name, err)
klog.Errorf("unable to fetch node metrics for node %q: %v", name, err)
return nil, errors.NewNotFound(m.groupResource, name)
}
@ -126,7 +125,7 @@ func (m *MetricStorage) getNodeMetrics(names ...string) ([]metrics.NodeMetrics,
for i, name := range names {
if usages[i] == nil {
glog.Errorf("unable to fetch node metrics for node %q: no metrics known for node", name)
klog.Errorf("unable to fetch node metrics for node %q: no metrics known for node", name)
continue
}

View file

@ -19,10 +19,8 @@ import (
"fmt"
"time"
"github.com/golang/glog"
"github.com/kubernetes-incubator/metrics-server/pkg/provider"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -33,6 +31,7 @@ import (
genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/registry/rest"
v1listers "k8s.io/client-go/listers/core/v1"
"k8s.io/klog"
"k8s.io/metrics/pkg/apis/metrics"
_ "k8s.io/metrics/pkg/apis/metrics/install"
)
@ -81,14 +80,14 @@ func (m *MetricStorage) List(ctx context.Context, options *metainternalversion.L
pods, err := m.podLister.Pods(namespace).List(labelSelector)
if err != nil {
errMsg := fmt.Errorf("Error while listing pods for selector %v in namespace %q: %v", labelSelector, namespace, err)
glog.Error(errMsg)
klog.Error(errMsg)
return &metrics.PodMetricsList{}, errMsg
}
metricsItems, err := m.getPodMetrics(pods...)
if err != nil {
errMsg := fmt.Errorf("Error while fetching pod metrics for selector %v in namespace %q: %v", labelSelector, namespace, err)
glog.Error(errMsg)
klog.Error(errMsg)
return &metrics.PodMetricsList{}, errMsg
}
@ -102,7 +101,7 @@ func (m *MetricStorage) Get(ctx context.Context, name string, opts *metav1.GetOp
pod, err := m.podLister.Pods(namespace).Get(name)
if err != nil {
errMsg := fmt.Errorf("Error while getting pod %v: %v", name, err)
glog.Error(errMsg)
klog.Error(errMsg)
if errors.IsNotFound(err) {
// return not-found errors directly
return &metrics.PodMetrics{}, err
@ -118,7 +117,7 @@ func (m *MetricStorage) Get(ctx context.Context, name string, opts *metav1.GetOp
err = fmt.Errorf("no metrics known for pod \"%s/%s\"", pod.Namespace, pod.Name)
}
if err != nil {
glog.Errorf("unable to fetch pod metrics for pod %s/%s: %v", pod.Namespace, pod.Name, err)
klog.Errorf("unable to fetch pod metrics for pod %s/%s: %v", pod.Namespace, pod.Name, err)
return nil, errors.NewNotFound(m.groupResource, fmt.Sprintf("%v/%v", namespace, name))
}
return &podMetrics[0], nil
@ -140,8 +139,12 @@ func (m *MetricStorage) getPodMetrics(pods ...*v1.Pod) ([]metrics.PodMetrics, er
res := make([]metrics.PodMetrics, 0, len(pods))
for i, pod := range pods {
if pod.Status.Phase != v1.PodRunning {
// ignore pod not in Running phase
continue
}
if containerMetrics[i] == nil {
glog.Errorf("unable to fetch pod metrics for pod %s/%s: no metrics known for pod", pod.Namespace, pod.Name)
klog.Errorf("unable to fetch pod metrics for pod %s/%s: no metrics known for pod", pod.Namespace, pod.Name)
continue
}