Merge pull request #261 from sameo/topic/annotations

container: Store annotations under ocid/annotations
cri-o · Dec 12, 2016 · 05b10c2 · 05b10c2
2 parents 1291b13 + 70ede1a
commit 05b10c2
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/server/container_create.go b/server/container_create.go
@@ -316,6 +316,12 @@ func (s *Server) createSandboxContainer(containerID string, containerName string
 	}
 	specgen.AddAnnotation("ocid/labels", string(labelsJSON))
 
+	annotationsJSON, err := json.Marshal(annotations)
+	if err != nil {
+		return nil, err
+	}
+	specgen.AddAnnotation("ocid/annotations", string(annotationsJSON))
+
 	if err = s.setupSeccomp(&specgen, containerName, sb.annotations); err != nil {
 		return nil, err
 	}