Deprecate '--cluster-xx' options and add warning#40510
Merged
cpuguy83 merged 2 commits intomoby:masterfrom Feb 27, 2020
Merged
Conversation
Co-authored-by: Yves Brissaud <yves.brissaud@gmail.com> Signed-off-by: Anca Iordache <anca.iordache@docker.com>
Member
|
Windows failure is unrelated (see the discussion on #40512 (comment)) |
AkihiroSuda
reviewed
Feb 18, 2020
cmd/dockerd/config.go
Outdated
| flags.Var(opts.NewNamedMapOpts("log-opts", conf.LogConfig.Config, nil), "log-opt", "Default log driver options for containers") | ||
|
|
||
| flags.StringVar(&conf.ClusterAdvertise, "cluster-advertise", "", "Address or interface name to advertise") | ||
| _ = flags.MarkDeprecated("cluster-advertise", "Deprecated option.") |
Member
There was a problem hiding this comment.
Can we add a more descriptive text as in flags.MarkDeprecated("restart", "Please use a restart policy on docker run")?
Maybe like flags.MarkDeprecated("cluster-advertise", "Swarm classic is deprecated. Please use Swarm-mode (docker swarm init)")?
AkihiroSuda
reviewed
Feb 18, 2020
| return conf, nil | ||
| } | ||
|
|
||
| func warnOnDeprecatedConfigOptions(config *config.Config) { |
Member
There was a problem hiding this comment.
This function should also handle --restart?
Author
There was a problem hiding this comment.
It is mostly intended for the options set in the daemon configuration file. Can't find if --restart has an equivalent in the daemon config file.
Member
|
LGTM but a couple of nits |
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
11 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
- What I did
Deprecated
--cluster-advertise,--cluster-store,--cluster-store-optflags from dockerd CLI.- How to verify it
- A picture of a cute animal (not mandatory but encouraged)
Co-authored-by: Yves Brissaud yves.brissaud@gmail.com
Signed-off-by: Anca Iordache anca.iordache@docker.com
relates to #40383