From d99e8d2c3b7d16535d2640faa721e9e564ac1cbf Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 5 Nov 2020 12:14:01 -0800 Subject: [PATCH] Unhide containerd-namespace flags The daemon expects to manage/handle everything going into the containerd namespace it uses, and things break when it shares that namespace with a second instance, so we should expose these flags and expect users that want two daemons sharing a containerd instance to use separate namespaces for them. Signed-off-by: Tianon Gravi --- cmd/dockerd/config.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cmd/dockerd/config.go b/cmd/dockerd/config.go index 8dfe8a3b85..73d5b81cb3 100644 --- a/cmd/dockerd/config.go +++ b/cmd/dockerd/config.go @@ -97,11 +97,9 @@ func installCommonConfigFlags(conf *config.Config, flags *pflag.FlagSet) error { conf.MaxDownloadAttempts = &maxDownloadAttempts flags.StringVar(&conf.ContainerdNamespace, "containerd-namespace", daemon.ContainersNamespace, "Containerd namespace to use") - if err := flags.MarkHidden("containerd-namespace"); err != nil { - return err - } flags.StringVar(&conf.ContainerdPluginNamespace, "containerd-plugins-namespace", containerd.PluginNamespace, "Containerd namespace to use for plugins") - return flags.MarkHidden("containerd-plugins-namespace") + + return nil } func installRegistryServiceFlags(options *registry.ServiceOptions, flags *pflag.FlagSet) {