github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 02:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3077 from weaveworks/nodename-env

Browse Source 
Read Kubernetes node name from environment
This commit is contained in:
Bryan Boreham
2018-02-19 18:46:10 +00:00
committed by GitHub
parent b742846835 04002f3287
commit ba32a400f7
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
prog/main.go
View File

@@ -302,7 +302,7 @@ func setupFlags(flags *flags) {
flag.StringVar(&flags.probe.dockerBridge, "probe.docker.bridge", "docker0", "the docker bridge name")
// K8s
flag.BoolVar(&flags.probe.kubernetesEnabled, "probe.kubernetes", false, "collect kubernetes-related attributes for containers, should only be enabled on the master node")
flag.BoolVar(&flags.probe.kubernetesEnabled, "probe.kubernetes", false, "collect kubernetes-related attributes for containers")
flag.DurationVar(&flags.probe.kubernetesClientConfig.Interval, "probe.kubernetes.interval", 10*time.Second, "how often to do a full resync of the kubernetes data")
flag.StringVar(&flags.probe.kubernetesClientConfig.Server, "probe.kubernetes.api", "", "The address and port of the Kubernetes API server (deprecated in favor of equivalent probe.kubernetes.server)")
flag.StringVar(&flags.probe.kubernetesClientConfig.CertificateAuthority, "probe.kubernetes.certificate-authority", "", "Path to a cert. file for the certificate authority")
@@ -428,6 +428,11 @@ func main() {
}
}
// Node name may be set by environment variable, e.g. from the Kubernetes downward API
if flags.probe.kubernetesNodeName == "" {
flags.probe.kubernetesNodeName = os.Getenv("KUBERNETES_NODENAME")
}
if flags.dryRun {
return
}