Merge pull request #97006 from lingsamuel/fix-cadvisor-machine-metrics

Fix missing cadvisor machine metrics
This commit is contained in:
Kubernetes Prow Robot
2020-12-31 21:15:51 -08:00
committed by GitHub
2 changed files with 4 additions and 0 deletions

View File

@@ -551,6 +551,9 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
if err != nil {
return nil, err
}
// Avoid collector collects it as a timestamped metric
// See PR #95210 and #97006 for more details.
machineInfo.Timestamp = time.Time{}
klet.setCachedMachineInfo(machineInfo)
imageBackOff := flowcontrol.NewBackOff(backOffPeriod, MaxContainerBackOff)