Merge pull request #2704 from thaJeztah/remove_dead_code

Remove unused "containerd-addr" and "containerd-namespace" flags
moby · Jul 11, 2018 · 231d181 · 231d181
2 parents 0c3aa9c + 1daf25e
commit 231d181
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/cmd/swarmd/main.go b/cmd/swarmd/main.go
@@ -257,8 +257,6 @@ func init() {
 	mainCmd.Flags().StringP("state-dir", "d", defaults.StateDir, "State directory")
 	mainCmd.Flags().StringP("join-token", "", "", "Specifies the secret token required to join the cluster")
 	mainCmd.Flags().String("engine-addr", "unix:///var/run/docker.sock", "Address of engine instance of agent.")
-	mainCmd.Flags().String("containerd-addr", "", "Address of containerd instance of agent.")
-	mainCmd.Flags().String("containerd-namespace", "swarmd", "Namespace to use when using containerd agent.")
 	mainCmd.Flags().String("hostname", "", "Override reported agent hostname")
 	mainCmd.Flags().String("advertise-remote-api", "", "Advertise address for remote API")
 	mainCmd.Flags().String("listen-remote-api", "0.0.0.0:4242", "Listen address for remote API")