@@ -69,12 +69,6 @@ func NewSummaryProvider(statsProvider Provider) SummaryProvider {
69
69
}
70
70
71
71
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
- }
78
72
nodeConfig := sp .provider .GetNodeConfig ()
79
73
rootStats , networkStats , err := sp .provider .GetCgroupStats ("/" , updateStats )
80
74
if err != nil {
@@ -104,7 +98,7 @@ func (sp *summaryProviderImpl) Get(ctx context.Context, updateStats bool) (*stat
104
98
}
105
99
106
100
nodeStats := statsapi.NodeStats {
107
- NodeName : node . Name ,
101
+ NodeName : string ( nodeConfig . NodeName ) ,
108
102
CPU : rootStats .CPU ,
109
103
Memory : rootStats .Memory ,
110
104
Swap : rootStats .Swap ,
@@ -126,12 +120,6 @@ func (sp *summaryProviderImpl) Get(ctx context.Context, updateStats bool) (*stat
126
120
}
127
121
128
122
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
- }
135
123
nodeConfig := sp .provider .GetNodeConfig ()
136
124
rootStats , err := sp .provider .GetCgroupCPUAndMemoryStats ("/" , false )
137
125
if err != nil {
@@ -144,7 +132,7 @@ func (sp *summaryProviderImpl) GetCPUAndMemoryStats(ctx context.Context) (*stats
144
132
}
145
133
146
134
nodeStats := statsapi.NodeStats {
147
- NodeName : node . Name ,
135
+ NodeName : string ( nodeConfig . NodeName ) ,
148
136
CPU : rootStats .CPU ,
149
137
Memory : rootStats .Memory ,
150
138
Swap : rootStats .Swap ,
0 commit comments