Merge pull request #7820 from dmcgowan/1.6-nil-check-hugepagelimits

[release/1.6] nil check to avoid panic on upgrade
containerd · Dec 14, 2022 · 34f7cec · 34f7cec
2 parents 7d02c97 + c8889df
commit 34f7cec
Showing 1 changed file with 6 additions and 4 deletions.
diff --git 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{