From 4140d288a8cb5e1fe53a3327dac2be4f834c2262 Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Wed, 4 May 2016 13:51:51 +0000 Subject: [PATCH] Don't scope docker IPs in Kubernetes --- probe/docker/container.go | 2 +- prog/probe.go | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/probe/docker/container.go b/probe/docker/container.go index 5b4fd29c1..7a7292f2a 100644 --- a/probe/docker/container.go +++ b/probe/docker/container.go @@ -298,7 +298,7 @@ func (c *container) NetworkMode() (string, bool) { func addScopeToIPs(hostID string, ips []string) []string { ipsWithScopes := []string{} for _, ip := range ips { - ipsWithScopes = append(ipsWithScopes, report.MakeScopedAddressNodeID(hostID, ip)) + ipsWithScopes = append(ipsWithScopes, report.MakeAddressNodeID(hostID, ip)) } return ipsWithScopes } diff --git a/prog/probe.go b/prog/probe.go index 075255f97..0b45ee574 100644 --- a/prog/probe.go +++ b/prog/probe.go @@ -134,8 +134,12 @@ func probeMain(flags probeFlags) { p.AddTagger(probe.NewTopologyTagger(), host.NewTagger(hostID)) if flags.dockerEnabled { - if err := report.AddLocalBridge(flags.dockerBridge); err != nil { - log.Errorf("Docker: problem with bridge %s: %v", flags.dockerBridge, err) + // Don't add the bridge in Kubernetes since container IPs are global and + // shouldn't be scoped + if !flags.kubernetesEnabled { + if err := report.AddLocalBridge(flags.dockerBridge); err != nil { + log.Errorf("Docker: problem with bridge %s: %v", flags.dockerBridge, err) + } } if registry, err := docker.NewRegistry(flags.dockerInterval, clients, true, hostID); err == nil { defer registry.Stop()