github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

remove dependency from top command

Browse Source
This commit is contained in:
zhengjiajin
2017-10-31 16:15:32 +08:00
parent d5e5cabafc
commit fe0f461cea
5 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubectl/cmd/top_node.go
View File

@@ -22,10 +22,10 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/kubernetes/pkg/api"
coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/metricsutil"
@@ -36,7 +36,7 @@ import (
type TopNodeOptions struct {
ResourceName string
Selector string
NodeClient coreclient.NodesGetter
NodeClient corev1.CoreV1Interface
HeapsterOptions HeapsterTopOptions
Client *metricsutil.HeapsterMetricsClient
Printer *metricsutil.TopCmdPrinter
@@ -118,7 +118,7 @@ func (o *TopNodeOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []
return cmdutil.UsageErrorf(cmd, "%s", cmd.Use)
}
clientset, err := f.ClientSet()
clientset, err := f.KubernetesClientSet()
if err != nil {
return err
}
@@ -149,7 +149,7 @@ func (o TopNodeOptions) RunTopNode() error {
return errors.New("metrics not available yet")
}
var nodes []api.Node
var nodes []v1.Node
if len(o.ResourceName) > 0 {
node, err := o.NodeClient.Nodes().Get(o.ResourceName, metav1.GetOptions{})
if err != nil {
@@ -166,7 +166,7 @@ func (o TopNodeOptions) RunTopNode() error {
nodes = append(nodes, nodeList.Items...)
}
allocatable := make(map[string]api.ResourceList)
allocatable := make(map[string]v1.ResourceList)
for _, n := range nodes {
allocatable[n.Name] = n.Status.Allocatable