[sandbox] Respect sandbox interfaces on shim side

mxpv · mxpv · commit b564c3315ff0 · 2021-04-19T15:16:40.000-07:00
Signed-off-by: Maksym Pavlenko &lt;pavlenko.maksym@gmail.com&gt;
diff --git a/runtime/v2/example/example.go b/runtime/v2/example/example.go
@@ -136,3 +136,34 @@ func (s *service) Update(ctx context.Context, r *taskAPI.UpdateTaskRequest) (*pt
 func (s *service) Wait(ctx context.Context, r *taskAPI.WaitRequest) (*taskAPI.WaitResponse, error) {
 	return nil, errdefs.ErrNotImplemented
 }
+
+// Optional sandbox extensions this shim may support
+var _ taskAPI.SandboxService = (*service)(nil)
+
+func (s *service) StartSandbox(ctx context.Context, req *taskAPI.StartSandboxRequest) (*taskAPI.StartSandboxResponse, error) {
+	return nil, errdefs.ErrNotImplemented
+}
+
+func (s *service) StopSandbox(ctx context.Context, req *taskAPI.StopSandboxRequest) (*taskAPI.StopSandboxResponse, error) {
+	return nil, errdefs.ErrNotImplemented
+}
+
+func (s *service) UpdateSandbox(ctx context.Context, req *taskAPI.UpdateSandboxRequest) (*taskAPI.UpdateSandboxResponse, error) {
+	return nil, errdefs.ErrNotImplemented
+}
+
+func (s *service) PauseSandbox(ctx context.Context, req *taskAPI.PauseSandboxRequest) (*taskAPI.PauseSandboxResponse, error) {
+	return nil, errdefs.ErrNotImplemented
+}
+
+func (s *service) ResumeSandbox(ctx context.Context, req *taskAPI.ResumeSandboxRequest) (*taskAPI.ResumeSandboxResponse, error) {
+	return nil, errdefs.ErrNotImplemented
+}
+
+func (s *service) SandboxStatus(ctx context.Context, req *taskAPI.SandboxStatusRequest) (*taskAPI.SandboxStatusResponse, error) {
+	return nil, errdefs.ErrNotImplemented
+}
+
+func (s *service) PingSandbox(ctx context.Context, req *taskAPI.PingRequest) (*taskAPI.PingResponse, error) {
+	return nil, errdefs.ErrNotImplemented
+}
diff --git a/runtime/v2/shim/shim.go b/runtime/v2/shim/shim.go
@@ -57,6 +57,7 @@ type StartOpts struct {
 	ContainerdBinary string
 	Address          string
 	TTRPCAddress     string
+	Options          io.Reader
 }
 
 // Init func for the creation of a shim server
@@ -233,6 +234,9 @@ func run(id string, initFunc Init, config Config) error {
 			ContainerdBinary: containerdBinaryFlag,
 			Address:          addressFlag,
 			TTRPCAddress:     ttrpcAddress,
+			// Additional shim options may be provided via Stdin
+			// See https://github.com/containerd/containerd/blob/c9afc4250ab183f9e944297c15df705851b3ec42/runtime/v2/shim/util.go#L116
+			Options: os.Stdin,
 		}
 		address, err := service.StartShim(ctx, opts)
 		if err != nil {
@@ -297,6 +301,11 @@ func (s *Client) Serve() error {
 	logrus.Debug("registering ttrpc server")
 	shimapi.RegisterTaskService(server, s.service)
 
+	// Register sandbox service if this shim is able to manage sandboxed environments
+	if sb, ok := s.service.(shimapi.SandboxService); ok {
+		shimapi.RegisterSandboxService(server, sb)
+	}
+
 	if err := serve(s.context, server, socketFlag); err != nil {
 		return err
 	}
