From c8889dfec9647b264ec93eb6903e2aa8a0843573 Mon Sep 17 00:00:00 2001
From: Mike Brown <brownwm@us.ibm.com>
Date: Tue, 13 Dec 2022 16:18:18 -0600
Subject: [PATCH] nil check to avoid panic on upgrade

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
(cherry picked from commit ce3a7327092b98e0287f24b73534d2e16acbf162)
Signed-off-by: Derek McGowan <derek@mcg.dev>
---
 pkg/cri/store/container/status.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkg/cri/store/container/status.go b/pkg/cri/store/container/status.go
index 1cf9a204e03a..0dedb6f6bcab 100644
--- a/pkg/cri/store/container/status.go
+++ b/pkg/cri/store/container/status.go
@@ -222,10 +222,12 @@ func deepCopyOf(s Status) Status {
 	if s.Resources != nil && s.Resources.Linux != nil {
 		hugepageLimits := make([]*runtime.HugepageLimit, len(s.Resources.Linux.HugepageLimits))
 		for _, l := range s.Resources.Linux.HugepageLimits {
-			hugepageLimits = append(hugepageLimits, &runtime.HugepageLimit{
-				PageSize: l.PageSize,
-				Limit:    l.Limit,
-			})
+			if l != nil {
+				hugepageLimits = append(hugepageLimits, &runtime.HugepageLimit{
+					PageSize: l.PageSize,
+					Limit:    l.Limit,
+				})
+			}
 		}
 		copy.Resources = &runtime.ContainerResources{
 			Linux: &runtime.LinuxContainerResources{