diff --git a/server/sandbox_run.go b/server/sandbox_run.go index fb0abe42..6359be17 100644 --- a/server/sandbox_run.go +++ b/server/sandbox_run.go @@ -271,7 +271,7 @@ func (s *Server) RunPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest g.AddAnnotation("crio/kube_name", kubeName) created := time.Now() - g.AddAnnotation("ocid/created", created.Format(time.RFC3339Nano)) + g.AddAnnotation("crio/created", created.Format(time.RFC3339Nano)) sb := &sandbox{ id: id, diff --git a/server/server.go b/server/server.go index 16643996..ce9564c1 100644 --- a/server/server.go +++ b/server/server.go @@ -7,6 +7,7 @@ import ( "os" "path/filepath" "sync" + "time" "github.com/Sirupsen/logrus" "github.com/containers/image/types" @@ -200,6 +201,11 @@ func (s *Server) loadSandbox(id string) error { privileged := m.Annotations["crio/privileged_runtime"] == "true" + created, err := time.Parse(time.RFC3339Nano, m.Annotations["crio/created"]) + if err != nil { + return err + } + sb := &sandbox{ id: id, name: name, @@ -214,6 +220,7 @@ func (s *Server) loadSandbox(id string) error { shmPath: m.Annotations["crio/shm_path"], privileged: privileged, resolvPath: m.Annotations["crio/resolv_path"], + created: created, } // We add a netNS only if we can load a permanent one.