Add support for 1.8 interfaces

dmcgowan · dmcgowan · commit 3be919f3c023 · 2024-06-13T06:22:21.000-07:00
Signed-off-by: Derek McGowan &lt;derek@mcg.dev&gt;
diff --git a/api/runtime/sandbox/v1/doc.go b/api/runtime/sandbox/v1/doc.go
@@ -15,3 +15,9 @@
 */
 
 package sandbox
+
+// Not implemented types introduced in later versions and included for API compatibility
+// Use of these types should only use not implemented errors
+
+type SandboxMetricsRequest struct{}
+type SandboxMetricsResponse struct{}
diff --git a/api/services/introspection/v1/doc.go b/api/services/introspection/v1/doc.go
@@ -15,3 +15,9 @@
 */
 
 package introspection
+
+// Not implemented types introduced in later versions and included for API compatibility
+// Use of these types should only use not implemented errors
+
+type PluginInfoRequest struct{}
+type PluginInfoResponse struct{}
diff --git a/events.go b/events.go
@@ -19,11 +19,12 @@ package containerd
 import (
 	"context"
 
+	"github.com/containerd/errdefs"
+	"github.com/containerd/typeurl/v2"
+
 	eventsapi "github.com/containerd/containerd/api/services/events/v1"
 	"github.com/containerd/containerd/events"
 	"github.com/containerd/containerd/protobuf"
-	"github.com/containerd/errdefs"
-	"github.com/containerd/typeurl/v2"
 )
 
 // EventService handles the publish, forward and subscribe of events.
diff --git a/runtime/v2/runc/pause/sandbox.go b/runtime/v2/runc/pause/sandbox.go
@@ -22,11 +22,12 @@ import (
 	"context"
 	"runtime"
 
-	"github.com/containerd/containerd/api/types"
-	"github.com/containerd/containerd/pkg/shutdown"
 	"github.com/containerd/ttrpc"
 	log "github.com/sirupsen/logrus"
 
+	"github.com/containerd/containerd/api/types"
+	"github.com/containerd/containerd/pkg/shutdown"
+
 	api "github.com/containerd/containerd/api/runtime/sandbox/v1"
 	"github.com/containerd/containerd/plugin"
 )
@@ -108,3 +109,7 @@ func (p *pauseService) PingSandbox(ctx context.Context, req *api.PingRequest) (*
 func (p *pauseService) ShutdownSandbox(ctx context.Context, request *api.ShutdownSandboxRequest) (*api.ShutdownSandboxResponse, error) {
 	return &api.ShutdownSandboxResponse{}, nil
 }
+
+func (p *pauseService) SandboxMetrics(ctx context.Context, request *api.SandboxMetricsRequest) (*api.SandboxMetricsResponse, error) {
+	return &api.SandboxMetricsResponse{}, nil
+}
diff --git a/sandbox/bridge.go b/sandbox/bridge.go
@@ -24,6 +24,7 @@ import (
 	"google.golang.org/grpc"
 
 	api "github.com/containerd/containerd/api/runtime/sandbox/v1"
+	"github.com/containerd/containerd/errdefs"
 )
 
 // NewClient returns a new sandbox client that handles both GRPC and TTRPC clients.
@@ -75,3 +76,7 @@ func (g *grpcBridge) PingSandbox(ctx context.Context, request *api.PingRequest)
 func (g *grpcBridge) ShutdownSandbox(ctx context.Context, request *api.ShutdownSandboxRequest) (*api.ShutdownSandboxResponse, error) {
 	return g.client.ShutdownSandbox(ctx, request)
 }
+
+func (g *grpcBridge) SandboxMetrics(ctx context.Context, request *api.SandboxMetricsRequest) (*api.SandboxMetricsResponse, error) {
+	return nil, errdefs.ToGRPC(errdefs.ErrNotImplemented)
+}
diff --git a/services/introspection/local.go b/services/introspection/local.go
@@ -30,6 +30,8 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/status"
 
+	"github.com/containerd/errdefs"
+
 	api "github.com/containerd/containerd/api/services/introspection/v1"
 	"github.com/containerd/containerd/api/types"
 	"github.com/containerd/containerd/filters"
@@ -38,7 +40,6 @@ import (
 	ptypes "github.com/containerd/containerd/protobuf/types"
 	"github.com/containerd/containerd/services"
 	"github.com/containerd/containerd/services/warning"
-	"github.com/containerd/errdefs"
 )
 
 func init() {
@@ -147,6 +148,10 @@ func (l *Local) Server(ctx context.Context, _ *ptypes.Empty, _ ...grpc.CallOptio
 	}, nil
 }
 
+func (l *Local) PluginInfo(ctx context.Context, in *api.PluginInfoRequest, opts ...grpc.CallOption) (*api.PluginInfoResponse, error) {
+	return nil, errdefs.ErrNotImplemented
+}
+
 func (l *Local) getUUID() (string, error) {
 	l.mu.Lock()
 	defer l.mu.Unlock()
diff --git a/services/introspection/service.go b/services/introspection/service.go
@@ -20,11 +20,13 @@ import (
 	context "context"
 	"errors"
 
+	"google.golang.org/grpc"
+
 	api "github.com/containerd/containerd/api/services/introspection/v1"
+	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/plugin"
 	ptypes "github.com/containerd/containerd/protobuf/types"
 	"github.com/containerd/containerd/services"
-	"google.golang.org/grpc"
 )
 
 func init() {
@@ -79,3 +81,7 @@ func (s *server) Plugins(ctx context.Context, req *api.PluginsRequest) (*api.Plu
 func (s *server) Server(ctx context.Context, empty *ptypes.Empty) (*api.ServerResponse, error) {
 	return s.local.Server(ctx, empty)
 }
+
+func (s *server) PluginInfo(ctx context.Context, in *api.PluginInfoRequest) (*api.PluginInfoResponse, error) {
+	return nil, errdefs.ToGRPC(errdefs.ErrNotImplemented)
+}
diff --git a/vendor/github.com/containerd/containerd/api/runtime/sandbox/v1/doc.go b/vendor/github.com/containerd/containerd/api/runtime/sandbox/v1/doc.go
diff --git a/vendor/github.com/containerd/containerd/api/services/introspection/v1/doc.go b/vendor/github.com/containerd/containerd/api/services/introspection/v1/doc.go

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ import (`
`24`	`24`	`"google.golang.org/grpc"`
`25`	`25`
`26`	`26`	`api "github.com/containerd/containerd/api/runtime/sandbox/v1"`
	`27`	`+ "github.com/containerd/containerd/errdefs"`
`27`	`28`	`)`
`28`	`29`
`29`	`30`	`// NewClient returns a new sandbox client that handles both GRPC and TTRPC clients.`
`@@ -75,3 +76,7 @@ func (g grpcBridge) PingSandbox(ctx context.Context, request api.PingRequest)`
`75`	`76`	`func (g grpcBridge) ShutdownSandbox(ctx context.Context, request api.ShutdownSandboxRequest) (*api.ShutdownSandboxResponse, error) {`
`76`	`77`	`return g.client.ShutdownSandbox(ctx, request)`
`77`	`78`	`}`
	`79`	`+`
	`80`	`+func (g grpcBridge) SandboxMetrics(ctx context.Context, request api.SandboxMetricsRequest) (*api.SandboxMetricsResponse, error) {`
	`81`	`+ return nil, errdefs.ToGRPC(errdefs.ErrNotImplemented)`
	`82`	`+}`