fix: issue with setting annotations and labels

shopware · Feb 12, 2025 · 8a49fe2 · 8a49fe2
1 parent d354746
commit 8a49fe2
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/api/v1/store.go b/api/v1/store.go
@@ -412,9 +412,15 @@ func (c *ContainerSpec) Merge(from ContainerMergeSpec) {
 		c.Tolerations = from.Tolerations
 	}
 	if from.Annotations != nil {
+		if c.Annotations == nil {
+			c.Annotations = make(map[string]string)
+		}
 		maps.Copy(c.Annotations, from.Annotations)
 	}
 	if from.Labels != nil {
+		if c.Labels == nil {
+			c.Labels = make(map[string]string)
+		}
 		maps.Copy(c.Labels, from.Labels)
 	}
 	if from.TerminationGracePeriodSeconds != 0 {