From 3405eb1f4100d2a4109930671572b87a03c1c518 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 31 Mar 2023 02:30:36 +0200 Subject: [PATCH 1/5] cli/command/formatter: remove deprecated KubernetesEndpoint This was deprecated in 467e650d4c75f078b4ac442789424be094e5d0cd, which is part of docker 23.0, so users should have had a chance to migrate. Signed-off-by: Sebastiaan van Stijn --- cli/command/formatter/context.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/cli/command/formatter/context.go b/cli/command/formatter/context.go index 71a53fd8ff..985a6ff32e 100644 --- a/cli/command/formatter/context.go +++ b/cli/command/formatter/context.go @@ -84,10 +84,3 @@ func (c *clientContextContext) Error() string { // TODO(thaJeztah) add "--no-trunc" option to context ls and set default to 30 cols to match "docker service ps" return Ellipsis(c.c.Error, maxErrLength) } - -// KubernetesEndpoint returns the kubernetes endpoint. -// -// Deprecated: support for kubernetes endpoints in contexts has been removed, and this formatting option will always be empty. -func (c *clientContextContext) KubernetesEndpoint() string { - return "" -} From 8b418be6d001f02ce5fad91363b99f40505c189f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 31 Mar 2023 02:35:10 +0200 Subject: [PATCH 2/5] cli/context/store: remove deprecated error-utilities These were deprecated in de6020a240ff95c97150f07d7a0dd59981143868, which is part of docker 23.0, so users should have had a chance to migrate. This removes IsErrContextDoesNotExist() and IsErrTLSDataDoesNotExist() Signed-off-by: Sebastiaan van Stijn --- cli/context/store/store.go | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/cli/context/store/store.go b/cli/context/store/store.go index 037464bb14..7101252303 100644 --- a/cli/context/store/store.go +++ b/cli/context/store/store.go @@ -494,20 +494,6 @@ func importEndpointTLS(tlsData *ContextTLSData, path string, data []byte) error return nil } -// IsErrContextDoesNotExist checks if the given error is a "context does not exist" condition. -// -// Deprecated: use github.com/docker/docker/errdefs.IsNotFound() -func IsErrContextDoesNotExist(err error) bool { - return errdefs.IsNotFound(err) -} - -// IsErrTLSDataDoesNotExist checks if the given error is a "context does not exist" condition -// -// Deprecated: use github.com/docker/docker/errdefs.IsNotFound() -func IsErrTLSDataDoesNotExist(err error) bool { - return errdefs.IsNotFound(err) -} - type contextdir string func contextdirOf(name string) contextdir { From aace828bbe36233aa42a96e5111e8f192800ea69 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 31 Mar 2023 02:37:17 +0200 Subject: [PATCH 3/5] cli/flags: remove deprecated CommonOptions, NewCommonOptions These were deprecated in 3499669e1860214f23c1d77af8b5cd7663ee1c5f, which is part of docker 23.0, so users should have had a chance to migrate. Signed-off-by: Sebastiaan van Stijn --- cli/flags/options_deprecated.go | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 cli/flags/options_deprecated.go diff --git a/cli/flags/options_deprecated.go b/cli/flags/options_deprecated.go deleted file mode 100644 index 97fb7e4e6a..0000000000 --- a/cli/flags/options_deprecated.go +++ /dev/null @@ -1,11 +0,0 @@ -package flags - -// CommonOptions are options common to both the client and the daemon. -// -// Deprecated: use [ClientOptions]. -type CommonOptions = ClientOptions - -// NewCommonOptions returns a new CommonOptions -// -// Deprecated: use [NewClientOptions]. -var NewCommonOptions = NewClientOptions From 328fac3a63beca24f18db63b5931e95f1054fd37 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 31 Mar 2023 02:40:34 +0200 Subject: [PATCH 4/5] cli/context/docker: remove deprecated Endpoint.TLSPassword This field was deprecated in 15535d45947a5501248ba2bfbc433486f782a604, which is part of docker 23.0, so users should have had a chance to migrate. Signed-off-by: Sebastiaan van Stijn --- cli/context/docker/load.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cli/context/docker/load.go b/cli/context/docker/load.go index 09ec40505a..76f6eaf305 100644 --- a/cli/context/docker/load.go +++ b/cli/context/docker/load.go @@ -25,12 +25,6 @@ type EndpointMeta = context.EndpointMetaBase type Endpoint struct { EndpointMeta TLSData *context.TLSData - - // Deprecated: Use of encrypted TLS private keys has been deprecated, and - // will be removed in a future release. Golang has deprecated support for - // legacy PEM encryption (as specified in RFC 1423), as it is insecure by - // design (see https://go-review.googlesource.com/c/go/+/264159). - TLSPassword string } // WithTLSData loads TLS materials for the endpoint From 66a1c3bab914eb485adaaeb787a97ff41020f3d6 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 31 Mar 2023 02:43:03 +0200 Subject: [PATCH 5/5] cli/config/configfile: remove deprecated StackOrchestrator field This field was deprecated in 6ea2767289d3ae7a65183da1758f4753d5053bd8, which is part of docker 23.0, so users should have had a chance to migrate. Signed-off-by: Sebastiaan van Stijn --- cli/config/configfile/file.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cli/config/configfile/file.go b/cli/config/configfile/file.go index 609a88c278..5db7f8b827 100644 --- a/cli/config/configfile/file.go +++ b/cli/config/configfile/file.go @@ -37,7 +37,6 @@ type ConfigFile struct { PruneFilters []string `json:"pruneFilters,omitempty"` Proxies map[string]ProxyConfig `json:"proxies,omitempty"` Experimental string `json:"experimental,omitempty"` - StackOrchestrator string `json:"stackOrchestrator,omitempty"` // Deprecated: swarm is now the default orchestrator, and this option is ignored. CurrentContext string `json:"currentContext,omitempty"` CLIPluginsExtraDirs []string `json:"cliPluginsExtraDirs,omitempty"` Plugins map[string]map[string]string `json:"plugins,omitempty"`