From 85df164dc72607420e0f9b70a18d1ba28f52dd37 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Tue, 27 Nov 2018 17:25:40 +0000 Subject: [PATCH] Stop special-casing the Docker bridge in Kubernetes mode In the case targeted, Kubernetes uses a bridge named 'cbr0'. The 'docker0' bridge should be locally-scoped in most cases, and exceptionally users can turn that off with --probe.docker.bridge="" --- prog/probe.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/prog/probe.go b/prog/probe.go index 3e14d2f37..f495bb145 100644 --- a/prog/probe.go +++ b/prog/probe.go @@ -266,9 +266,7 @@ func probeMain(flags probeFlags, targets []appclient.Target) { } if flags.dockerEnabled { - // Don't add the bridge in Kubernetes since container IPs are global and - // shouldn't be scoped - if flags.dockerBridge != "" && !flags.kubernetesEnabled { + if flags.dockerBridge != "" { if err := report.AddLocalBridge(flags.dockerBridge); err != nil { log.Errorf("Docker: problem with bridge %s: %v", flags.dockerBridge, err) }