From a757a69b45dac9293847b20dd84bad49c85fd2c8 Mon Sep 17 00:00:00 2001
From: Pengfei Ni <peni@microsoft.com>
Date: Mon, 9 Apr 2018 09:43:39 +0800
Subject: [PATCH] Remove the workaround of heapster panic

---
 pkg/kubelet/stats/BUILD                 |  1 -
 pkg/kubelet/stats/cri_stats_provider.go | 13 +++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkg/kubelet/stats/BUILD b/pkg/kubelet/stats/BUILD
index 8bbca05b29e..bebda0263e2 100644
--- a/pkg/kubelet/stats/BUILD
+++ b/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",
diff --git a/pkg/kubelet/stats/cri_stats_provider.go b/pkg/kubelet/stats/cri_stats_provider.go
index 1ed2e300efd..e82ca97a0d8 100644
--- a/pkg/kubelet/stats/cri_stats_provider.go
+++ b/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 {