Skip to content

Commit

Permalink
Turn everything else off in Kubernetes cluster probe
Browse files Browse the repository at this point in the history
  • Loading branch information
bboreham committed Oct 12, 2018
1 parent 78eaf93 commit fb96fe0
Showing 1 changed file with 15 additions and 11 deletions.
26 changes: 15 additions & 11 deletions prog/probe.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,21 @@ func probeMain(flags probeFlags, targets []appclient.Target) {
logCensoredArgs()
defer log.Info("probe exiting")

switch flags.kubernetesRole {
case "": // nothing special
case kubernetesRoleHost:
flags.kubernetesEnabled = true
case kubernetesRoleCluster:
flags.kubernetesKubeletPort = 0
flags.kubernetesEnabled = true
flags.spyProcs = false
flags.procEnabled = false
flags.useConntrack = false
flags.useEbpfConn = false
default:
log.Warnf("unrecognized --probe.kubernetes.role: %s", flags.kubernetesRole)
}

if flags.spyProcs && os.Getegid() != 0 {
log.Warn("--probe.proc.spy=true, but that requires root to find everything")
}
Expand Down Expand Up @@ -233,17 +248,6 @@ func probeMain(flags probeFlags, targets []appclient.Target) {
defer endpointReporter.Stop()
p.AddReporter(endpointReporter)

switch flags.kubernetesRole {
case "": // nothing special
case kubernetesRoleHost:
flags.kubernetesEnabled = true
case kubernetesRoleCluster:
flags.kubernetesKubeletPort = 0
flags.kubernetesEnabled = true
default:
log.Warnf("unrecognized --probe.kubernetes.role: %s", flags.kubernetesRole)
}

if flags.dockerEnabled {
// Don't add the bridge in Kubernetes since container IPs are global and
// shouldn't be scoped
Expand Down

0 comments on commit fb96fe0

Please sign in to comment.