Skip to content

Commit 46aef8e

Browse files
committed
WIP: do not query for node name from api for metrics resource
Signed-off-by: Peter Hunt <pehunt@redhat.com>
1 parent 9c2642e commit 46aef8e

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

pkg/kubelet/server/stats/summary.go

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@ func NewSummaryProvider(statsProvider Provider) SummaryProvider {
6969
}
7070

7171
func (sp *summaryProviderImpl) Get(ctx context.Context, updateStats bool) (*statsapi.Summary, error) {
72-
// TODO(timstclair): Consider returning a best-effort response if any of
73-
// the following errors occur.
74-
node, err := sp.provider.GetNode()
75-
if err != nil {
76-
return nil, fmt.Errorf("failed to get node info: %v", err)
77-
}
7872
nodeConfig := sp.provider.GetNodeConfig()
7973
rootStats, networkStats, err := sp.provider.GetCgroupStats("/", updateStats)
8074
if err != nil {
@@ -104,7 +98,7 @@ func (sp *summaryProviderImpl) Get(ctx context.Context, updateStats bool) (*stat
10498
}
10599

106100
nodeStats := statsapi.NodeStats{
107-
NodeName: node.Name,
101+
NodeName: string(nodeConfig.NodeName),
108102
CPU: rootStats.CPU,
109103
Memory: rootStats.Memory,
110104
Swap: rootStats.Swap,
@@ -126,12 +120,6 @@ func (sp *summaryProviderImpl) Get(ctx context.Context, updateStats bool) (*stat
126120
}
127121

128122
func (sp *summaryProviderImpl) GetCPUAndMemoryStats(ctx context.Context) (*statsapi.Summary, error) {
129-
// TODO(timstclair): Consider returning a best-effort response if any of
130-
// the following errors occur.
131-
node, err := sp.provider.GetNode()
132-
if err != nil {
133-
return nil, fmt.Errorf("failed to get node info: %v", err)
134-
}
135123
nodeConfig := sp.provider.GetNodeConfig()
136124
rootStats, err := sp.provider.GetCgroupCPUAndMemoryStats("/", false)
137125
if err != nil {
@@ -144,7 +132,7 @@ func (sp *summaryProviderImpl) GetCPUAndMemoryStats(ctx context.Context) (*stats
144132
}
145133

146134
nodeStats := statsapi.NodeStats{
147-
NodeName: node.Name,
135+
NodeName: string(nodeConfig.NodeName),
148136
CPU: rootStats.CPU,
149137
Memory: rootStats.Memory,
150138
Swap: rootStats.Swap,

0 commit comments

Comments
 (0)