From 98b002f7c0f6bd3b9da83f6f94e77a8578152353 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Tue, 15 Aug 2017 13:48:33 +0000 Subject: [PATCH] Remove unnecessary 'Version' in proxy --- prog/weaver/main.go | 5 ++--- proxy/proxy.go | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/prog/weaver/main.go b/prog/weaver/main.go index 09d61994..cdf0810b 100644 --- a/prog/weaver/main.go +++ b/prog/weaver/main.go @@ -210,7 +210,7 @@ func main() { mflag.StringVar(&pluginConfig.Socket, []string{"-plugin-socket"}, "/run/docker/plugins/weave.sock", "plugin socket on which to listen") mflag.StringVar(&pluginConfig.MeshSocket, []string{"-plugin-mesh-socket"}, "/run/docker/plugins/weavemesh.sock", "plugin socket on which to listen in mesh mode") - proxyConfig := newProxyConfig(version, defaultDockerHost) + proxyConfig := newProxyConfig(defaultDockerHost) // crude way of detecting that we probably have been started in a // container, with `weave launch` --> suppress misleading paths in @@ -526,9 +526,8 @@ func (nopPacketLogging) LogPacket(string, weave.PacketKey) { func (nopPacketLogging) LogForwardPacket(string, weave.ForwardPacketKey) { } -func newProxyConfig(version string, defaultDockerHost string) *weaveproxy.Config { +func newProxyConfig(defaultDockerHost string) *weaveproxy.Config { proxyConfig := weaveproxy.Config{ - Version: version, Image: getenvOrDefault("EXEC_IMAGE", "weaveworks/weaveexec"), DockerBridge: getenvOrDefault("DOCKER_BRIDGE", "docker0"), DockerHost: defaultDockerHost, diff --git a/proxy/proxy.go b/proxy/proxy.go index 893168bc..199ae0f9 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -60,7 +60,6 @@ type Config struct { NoDefaultIPAM bool NoRewriteHosts bool TLSConfig TLSConfig - Version string WithoutDNS bool NoMulticastRoute bool KeepTXOn bool