github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #102917 from bysnupy/patch-1

Browse Source 
Use "Capacity" instead of "Allocatable" for an accurate node memory total size
This commit is contained in:
Kubernetes Prow Robot 2021-11-05 11:39:09 -07:00 committed by GitHub
commit cee4aa09b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
staging/src/k8s.io/kubectl/pkg/cmd/top/top_node.go
View File

@ -44,6 +44,7 @@ type TopNodeOptions struct {
SortBy string SortBy string
NoHeaders bool NoHeaders bool
UseProtocolBuffers bool UseProtocolBuffers bool
ShowCapacity bool
NodeClient corev1client.CoreV1Interface NodeClient corev1client.CoreV1Interface
Printer *metricsutil.TopCmdPrinter Printer *metricsutil.TopCmdPrinter
@ -93,6 +94,7 @@ func NewCmdTopNode(f cmdutil.Factory, o *TopNodeOptions, streams genericclioptio
cmd.Flags().StringVar(&o.SortBy, "sort-by", o.SortBy, "If non-empty, sort nodes list using specified field. The field can be either 'cpu' or 'memory'.") cmd.Flags().StringVar(&o.SortBy, "sort-by", o.SortBy, "If non-empty, sort nodes list using specified field. The field can be either 'cpu' or 'memory'.")
cmd.Flags().BoolVar(&o.NoHeaders, "no-headers", o.NoHeaders, "If present, print output without headers") cmd.Flags().BoolVar(&o.NoHeaders, "no-headers", o.NoHeaders, "If present, print output without headers")
cmd.Flags().BoolVar(&o.UseProtocolBuffers, "use-protocol-buffers", o.UseProtocolBuffers, "Enables using protocol-buffers to access Metrics API.") cmd.Flags().BoolVar(&o.UseProtocolBuffers, "use-protocol-buffers", o.UseProtocolBuffers, "Enables using protocol-buffers to access Metrics API.")
cmd.Flags().BoolVar(&o.ShowCapacity, "show-capacity", o.ShowCapacity, "Print node resources based on Capacity instead of Allocatable(default) of the nodes.")
return cmd return cmd
} }
@ -188,13 +190,17 @@ func (o TopNodeOptions) RunTopNode() error {
nodes = append(nodes, nodeList.Items...) nodes = append(nodes, nodeList.Items...)
} }
allocatable := make(map[string]v1.ResourceList) availableResources := make(map[string]v1.ResourceList)
for _, n := range nodes { for _, n := range nodes {
allocatable[n.Name] = n.Status.Allocatable if !o.ShowCapacity {
availableResources[n.Name] = n.Status.Allocatable
} else {
availableResources[n.Name] = n.Status.Capacity
}
} }
return o.Printer.PrintNodeMetrics(metrics.Items, allocatable, o.NoHeaders, o.SortBy) return o.Printer.PrintNodeMetrics(metrics.Items, availableResources, o.NoHeaders, o.SortBy)
} }
func getNodeMetricsFromMetricsAPI(metricsClient metricsclientset.Interface, resourceName string, selector labels.Selector) (*metricsapi.NodeMetricsList, error) { func getNodeMetricsFromMetricsAPI(metricsClient metricsclientset.Interface, resourceName string, selector labels.Selector) (*metricsapi.NodeMetricsList, error) {