Bumping k8s dependencies to 1.13

This commit is contained in:
Cheng Xing
2018-11-16 14:08:25 -08:00
parent 305407125c
commit b4c0b68ec7
8002 changed files with 884099 additions and 276228 deletions

View File

@@ -23,7 +23,7 @@ import (
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/kubernetes/pkg/printers"
metricsapi "k8s.io/metrics/pkg/apis/metrics"
)
@@ -67,7 +67,7 @@ func (printer *TopCmdPrinter) PrintNodeMetrics(metrics []metricsapi.NodeMetrics,
printColumnNames(w, NodeColumns)
var usage v1.ResourceList
for _, m := range metrics {
err := legacyscheme.Scheme.Convert(&m.Usage, &usage, nil)
err := scheme.Scheme.Convert(&m.Usage, &usage, nil)
if err != nil {
return err
}
@@ -76,6 +76,12 @@ func (printer *TopCmdPrinter) PrintNodeMetrics(metrics []metricsapi.NodeMetrics,
Metrics: usage,
Available: availableResources[m.Name],
})
delete(availableResources, m.Name)
}
// print lines for nodes of which the metrics is unreachable.
for nodeName := range availableResources {
printMissingMetricsNodeLine(w, nodeName)
}
return nil
}
@@ -127,7 +133,7 @@ func printSinglePodMetrics(out io.Writer, m *metricsapi.PodMetrics, printContain
for _, c := range m.Containers {
var usage v1.ResourceList
err := legacyscheme.Scheme.Convert(&c.Usage, &usage, nil)
err := scheme.Scheme.Convert(&c.Usage, &usage, nil)
if err != nil {
return err
}
@@ -171,6 +177,18 @@ func printMetricsLine(out io.Writer, metrics *ResourceMetricsInfo) {
fmt.Fprint(out, "\n")
}
func printMissingMetricsNodeLine(out io.Writer, nodeName string) {
printValue(out, nodeName)
unknownMetricsStatus := "<unknown>"
for i := 0; i < len(MeasuredResources); i++ {
printValue(out, unknownMetricsStatus)
printValue(out, "\t")
printValue(out, unknownMetricsStatus)
printValue(out, "\t")
}
fmt.Fprint(out, "\n")
}
func printValue(out io.Writer, value interface{}) {
fmt.Fprintf(out, "%v\t", value)
}