Merge pull request #77731 from yastij/automated-cherry-pick-of-#77656…

…-upstream-release-1.12 Automated cherry pick of #77656: check if Memory is not nil for container stats
kubernetes · May 14, 2019 · 8c3d596 · 8c3d596
2 parents 1c74d93 + 6733165
commit 8c3d596
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/kubelet/stats/helper.go b/pkg/kubelet/stats/helper.go
@@ -52,7 +52,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{