Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use "Capacity" instead of "Allocatable" for an accurate node memory total size #102917

Merged
merged 1 commit into from
Nov 5, 2021
Merged

Use "Capacity" instead of "Allocatable" for an accurate node memory total size #102917

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 9 additions & 3 deletions staging/src/k8s.io/kubectl/pkg/cmd/top/top_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ type TopNodeOptions struct {
SortBy string
NoHeaders bool
UseProtocolBuffers bool
ShowCapacity bool

NodeClient corev1client.CoreV1Interface
Printer *metricsutil.TopCmdPrinter
Expand Down Expand Up @@ -91,6 +92,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().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.ShowCapacity, "show-capacity", o.ShowCapacity, "Print node resources based on Capacity instead of Allocatable(default) of the nodes.")

return cmd
}
Expand Down Expand Up @@ -186,13 +188,17 @@ func (o TopNodeOptions) RunTopNode() error {
nodes = append(nodes, nodeList.Items...)
}

allocatable := make(map[string]v1.ResourceList)
availableResources := make(map[string]v1.ResourceList)

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) {
Expand Down