Merge pull request #501 from runcom/kubeName-annotation

server: store kubeName in annotations
This commit is contained in:
Mrunal Patel 2017-05-08 10:06:47 -07:00 committed by GitHub
commit 5d1a9cb1c9
2 changed files with 2 additions and 0 deletions

View file

@ -265,6 +265,7 @@ func (s *Server) RunPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
g.AddAnnotation("ocid/privileged_runtime", fmt.Sprintf("%v", privileged))
g.AddAnnotation("ocid/resolv_path", resolvPath)
g.AddAnnotation("ocid/hostname", hostname)
g.AddAnnotation("ocid/kube_name", kubeName)
sb := &sandbox{
id: id,

View file

@ -203,6 +203,7 @@ func (s *Server) loadSandbox(id string) error {
sb := &sandbox{
id: id,
name: name,
kubeName: m.Annotations["ocid/kube_name"],
logDir: filepath.Dir(m.Annotations["ocid/log_path"]),
labels: labels,
containers: oci.NewMemoryStore(),