From ce94e69fd5d639d7f0230fe50f0c6dceb5fc000a Mon Sep 17 00:00:00 2001 From: Marc CARRE Date: Fri, 21 Apr 2017 14:31:49 +0100 Subject: [PATCH] Clean-up: remove deprecated flag --with-dns. --- prog/weaveproxy/main.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/prog/weaveproxy/main.go b/prog/weaveproxy/main.go index bf326187be..65c29fdcc4 100644 --- a/prog/weaveproxy/main.go +++ b/prog/weaveproxy/main.go @@ -28,7 +28,6 @@ func main() { justVersion bool logLevel = "info" c proxy.Config - withDNS bool ) c.Version = version @@ -47,7 +46,6 @@ func main() { mflag.BoolVar(&c.TLSConfig.Enabled, []string{"#tls", "-tls"}, false, "Use TLS; implied by --tlsverify") mflag.StringVar(&c.TLSConfig.Key, []string{"#tlskey", "-tlskey"}, "", "Path to TLS key file") mflag.BoolVar(&c.TLSConfig.Verify, []string{"#tlsverify", "-tlsverify"}, false, "Use TLS and verify the remote") - mflag.BoolVar(&withDNS, []string{"#-with-dns", "#w"}, false, "option removed") mflag.BoolVar(&c.WithoutDNS, []string{"-without-dns"}, false, "instruct created containers to never use weaveDNS as their nameserver") mflag.BoolVar(&c.NoMulticastRoute, []string{"-no-multicast-route"}, false, "do not add a multicast route via the weave interface when attaching containers") mflag.Parse() @@ -62,10 +60,6 @@ func main() { Log.Infoln("weave proxy", version) Log.Infoln("Command line arguments:", strings.Join(os.Args[1:], " ")) - if withDNS { - Log.Warning("--with-dns option has been removed; DNS is on by default") - } - c.Image = getenv("EXEC_IMAGE", "weaveworks/weaveexec") c.DockerBridge = getenv("DOCKER_BRIDGE", "docker0") c.DockerHost = getenv("DOCKER_HOST", "unix:///var/run/docker.sock")