github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-01 22:34:14 +00:00
Code Issues Projects Releases Wiki Activity

snip legacy scheme uses we don't need

Browse Source
This commit is contained in:
David Eads
2018-08-02 13:29:16 -04:00
parent a54c0974e3
commit dd2af1c8a4
28 changed files with 145 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubectl/metricsutil/metrics_printer.go
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
}
@@ -133,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
}