Merge pull request kata-containers#10276 from Apokleos/fix-runtime-cdi

runtime: Fix runtime/cdi panic with assignment to entry in nil map
openanolis · Sep 11, 2024 · d096803 · d096803
2 parents 3f541af + 1684c19
commit d096803
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/runtime/virtcontainers/container.go b/src/runtime/virtcontainers/container.go
@@ -1010,6 +1010,9 @@ func (c *Container) siblingAnnotation(devPath string, siblings []DeviceRelation)
 			vfioNum := filepath.Base(devPath)
 			annoKey := fmt.Sprintf("cdi.k8s.io/vfio%s", vfioNum)
 			annoValue := fmt.Sprintf("nvidia.com/gpu=%d", sibling.Index)
+			if c.config.CustomSpec.Annotations == nil {
+				c.config.CustomSpec.Annotations = make(map[string]string)
+			}
 			c.config.CustomSpec.Annotations[annoKey] = annoValue
 			c.Logger().Infof("annotated container with %s: %s", annoKey, annoValue)
 		}