Merge pull request #62261 from feiskyer/heapster

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Remove the workaround of heapster panic

**What this PR does / why we need it**:

In #55213, we merged a work around for heapster panic #54962. Heapster has been upgraded to v1.5.2 in #61396, this PR removes the workaroud.


**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #55280

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```

pkg/kubelet/stats/BUILD

@@ -61,7 +61,6 @@ go_library(
         "//pkg/kubelet/types:go_default_library",
         "//pkg/volume:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
-        "//vendor/github.com/golang/protobuf/proto:go_default_library",
         "//vendor/github.com/google/cadvisor/fs:go_default_library",
         "//vendor/github.com/google/cadvisor/info/v1:go_default_library",
         "//vendor/github.com/google/cadvisor/info/v2:go_default_library",

pkg/kubelet/stats/cri_stats_provider.go

@@ -25,7 +25,6 @@ import (
 	"time"
 
 	"github.com/golang/glog"
-	"github.com/golang/protobuf/proto"
 	cadvisorfs "github.com/google/cadvisor/fs"
 
 	cadvisorapiv2 "github.com/google/cadvisor/info/v2"
@@ -301,15 +300,9 @@ func (p *criStatsProvider) makeContainerStats(
 		Name: stats.Attributes.Metadata.Name,
 		// The StartTime in the summary API is the container creation time.
 		StartTime: metav1.NewTime(time.Unix(0, container.CreatedAt)),
-		// Work around heapster bug. https://github.com/kubernetes/kubernetes/issues/54962
-		// TODO(random-liu): Remove this after heapster is updated to newer than 1.5.0-beta.0.
-		CPU: &statsapi.CPUStats{
-			UsageNanoCores: proto.Uint64(0),
-		},
-		Memory: &statsapi.MemoryStats{
-			RSSBytes: proto.Uint64(0),
-		},
-		Rootfs: &statsapi.FsStats{},
+		CPU:       &statsapi.CPUStats{},
+		Memory:    &statsapi.MemoryStats{},
+		Rootfs:    &statsapi.FsStats{},
 		// UserDefinedMetrics is not supported by CRI.
 	}
 	if stats.Cpu != nil {