mirror of
https://github.com/weaveworks/scope.git
synced 2026-08-18 20:07:06 +00:00
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=""
This commit is contained in:
+1
-3
@@ -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)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user