From f6087365e9e1c6d9426e39dfc8a0d5be5a584d28 Mon Sep 17 00:00:00 2001
From: Yassine TIJANI <yasstij11@gmail.com>
Date: Thu, 9 May 2019 14:53:38 +0200
Subject: [PATCH] check if Memory is not nil for container stats

---
 pkg/kubelet/stats/helper.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/kubelet/stats/helper.go b/pkg/kubelet/stats/helper.go
index 273205338bc..454facc4e98 100644
--- a/pkg/kubelet/stats/helper.go
+++ b/pkg/kubelet/stats/helper.go
@@ -51,7 +51,7 @@ func cadvisorInfoToCPUandMemoryStats(info *cadvisorapiv2.ContainerInfo) (*statsa
 			cpuStats.UsageCoreNanoSeconds = &cstat.Cpu.Usage.Total
 		}
 	}
-	if info.Spec.HasMemory {
+	if info.Spec.HasMemory && cstat.Memory != nil {
 		pageFaults := cstat.Memory.ContainerData.Pgfault
 		majorPageFaults := cstat.Memory.ContainerData.Pgmajfault
 		memoryStats = &statsapi.MemoryStats{