vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add annotations for pods

Browse source 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
This commit is contained in:
Mrunal Patel 2016-09-30 15:48:31 -07:00
parent b0e23c4a24
commit d5a8d1bae3
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
server/sandbox.go
View file

@ -20,6 +20,7 @@ type sandbox struct {
name string name string
logDir string logDir string
labels map[string]string labels map[string]string
annotations map[string]string
containers oci.Store containers oci.Store
} }
@ -129,7 +130,15 @@ func (s *Server) RunPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
if err != nil { if err != nil {
return nil, err return nil, err
} }
// add annotations
annotations := req.GetConfig().GetAnnotations()
annotationsJSON, err := json.Marshal(annotations)
if err != nil {
return nil, err
}
g.AddAnnotation("ocid/labels", string(labelsJSON)) g.AddAnnotation("ocid/labels", string(labelsJSON))
g.AddAnnotation("ocid/annotations", string(annotationsJSON))
g.AddAnnotation("ocid/log_path", logDir) g.AddAnnotation("ocid/log_path", logDir)
g.AddAnnotation("ocid/name", name) g.AddAnnotation("ocid/name", name)
containerName := name + "-infra" containerName := name + "-infra"
@ -139,10 +148,10 @@ func (s *Server) RunPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
name: name, name: name,
logDir: logDir, logDir: logDir,
labels: labels, labels: labels,
annotations: annotations,
containers: oci.NewMemoryStore(), containers: oci.NewMemoryStore(),
}) })
annotations := req.GetConfig().GetAnnotations()
for k, v := range annotations { for k, v := range annotations {
g.AddAnnotation(k, v) g.AddAnnotation(k, v)
} }