From 5ca56ddbb48168fafb15a786cd082bce613c0d80 Mon Sep 17 00:00:00 2001 From: Maksym Pavlenko Date: Sat, 10 Feb 2024 17:54:48 -0800 Subject: [PATCH] Remove deprecated funcs from restart package Signed-off-by: Maksym Pavlenko --- core/runtime/restart/restart.go | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/core/runtime/restart/restart.go b/core/runtime/restart/restart.go index 5ec381ac6..e749fd5ff 100644 --- a/core/runtime/restart/restart.go +++ b/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 {