Merge pull request containerd#9803 from mxpv/depr

Remove deprecated functions and packages

Author: dims

client/signals.go

@@ -81,12 +81,3 @@ func GetOCIStopSignal(ctx context.Context, image Image, defaultSignal string) (s
 
 	return config.StopSignal, nil
 }
-
-// ParseSignal parses a given string into a syscall.Signal
-// the rawSignal can be a string with "SIG" prefix,
-// or a signal number in string format.
-//
-// Deprecated: Use github.com/moby/sys/signal instead.
-func ParseSignal(rawSignal string) (syscall.Signal, error) {
-	return signal.ParseSignal(rawSignal)
-}

core/runtime/restart/restart.go

@@ -38,7 +38,6 @@ import (
 
 	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/core/containers"
-	"github.com/containerd/containerd/v2/pkg/cio"
 	"github.com/containerd/log"
 )
 
@@ -157,32 +156,6 @@ func WithLogURIString(uriString string) func(context.Context, *containerd.Client
 	}
 }
 
-// WithBinaryLogURI sets the binary-type log uri for a container.
-//
-// Deprecated(in release 1.5): use WithLogURI
-func WithBinaryLogURI(binary string, args map[string]string) func(context.Context, *containerd.Client, *containers.Container) error {
-	uri, err := cio.LogURIGenerator("binary", binary, args)
-	if err != nil {
-		return func(context.Context, *containerd.Client, *containers.Container) error {
-			return err
-		}
-	}
-	return WithLogURI(uri)
-}
-
-// WithFileLogURI sets the file-type log uri for a container.
-//
-// Deprecated(in release 1.5): use WithLogURI
-func WithFileLogURI(path string) func(context.Context, *containerd.Client, *containers.Container) error {
-	uri, err := cio.LogURIGenerator("file", path, nil)
-	if err != nil {
-		return func(context.Context, *containerd.Client, *containers.Container) error {
-			return err
-		}
-	}
-	return WithLogURI(uri)
-}
-
 // WithStatus sets the status for a container
 func WithStatus(status containerd.ProcessStatus) func(context.Context, *containerd.Client, *containers.Container) error {
 	return func(_ context.Context, _ *containerd.Client, c *containers.Container) error {

integration/client/signals_test.go

@@ -36,10 +36,6 @@ func ContextDialer(ctx context.Context, address string) (net.Conn, error) {
 	return timeoutDialer(address, 0)
 }
 
-// Dialer returns a GRPC net.Conn connected to the provided address
-// Deprecated: use ContextDialer and grpc.WithContextDialer.
-var Dialer = timeoutDialer
-
 func timeoutDialer(address string, timeout time.Duration) (net.Conn, error) {
 	var (
 		stopC = make(chan struct{})