From 293fd7882112e414cf7cae02810aca516c7febb7 Mon Sep 17 00:00:00 2001 From: Yusuke KUOKA Date: Fri, 5 Apr 2019 20:50:27 +0900 Subject: [PATCH] feat: make tiller probeAddr configurable As many people have requested and discussed in #3159. The variable name are kept the same as before. Corresponding command-line flag is named, and description are written, after the existing flag for gRPC. The scope of this change is intentionally limited to the minimum. That is, I have not yet added `--probe=false`, because it shouldn't be a blocker if we can change the port number. Signed-off-by: Yusuke KUOKA --- cmd/tiller/tiller.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/tiller/tiller.go b/cmd/tiller/tiller.go index a1141b591..f3ba197b5 100644 --- a/cmd/tiller/tiller.go +++ b/cmd/tiller/tiller.go @@ -67,7 +67,6 @@ const ( storageConfigMap = "configmap" storageSecret = "secret" - probeAddr = ":44135" traceAddr = ":44136" // defaultMaxHistory sets the maximum number of releases to 0: unlimited @@ -76,6 +75,7 @@ const ( var ( grpcAddr = flag.String("listen", ":44134", "address:port to listen on") + probeAddr = flag.String("probe-listen", ":44135", "address:port to listen on for probes") enableTracing = flag.Bool("trace", false, "enable rpc tracing") store = flag.String("storage", storageConfigMap, "storage driver to use. One of 'configmap', 'memory', or 'secret'") remoteReleaseModules = flag.Bool("experimental-release", false, "enable experimental release modules") @@ -187,7 +187,7 @@ func start() { logger.Printf("Starting Tiller %s (tls=%t)", version.GetVersion(), *tlsEnable || *tlsVerify) logger.Printf("GRPC listening on %s", *grpcAddr) - logger.Printf("Probes listening on %s", probeAddr) + logger.Printf("Probes listening on %s", *probeAddr) logger.Printf("Storage driver is %s", env.Releases.Name()) logger.Printf("Max history per release is %d", *maxHistory) @@ -213,7 +213,7 @@ func start() { goprom.Register(rootServer) addPrometheusHandler(mux) - if err := http.ListenAndServe(probeAddr, mux); err != nil { + if err := http.ListenAndServe(*probeAddr, mux); err != nil { probeErrCh <- err } }()