Commit 293fd788 authored by Yusuke KUOKA's avatar Yusuke KUOKA

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: 's avatarYusuke KUOKA <ykuoka@gmail.com>
parent e14a0378
...@@ -67,7 +67,6 @@ const ( ...@@ -67,7 +67,6 @@ const (
storageConfigMap = "configmap" storageConfigMap = "configmap"
storageSecret = "secret" storageSecret = "secret"
probeAddr = ":44135"
traceAddr = ":44136" traceAddr = ":44136"
// defaultMaxHistory sets the maximum number of releases to 0: unlimited // defaultMaxHistory sets the maximum number of releases to 0: unlimited
...@@ -76,6 +75,7 @@ const ( ...@@ -76,6 +75,7 @@ const (
var ( var (
grpcAddr = flag.String("listen", ":44134", "address:port to listen on") 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") enableTracing = flag.Bool("trace", false, "enable rpc tracing")
store = flag.String("storage", storageConfigMap, "storage driver to use. One of 'configmap', 'memory', or 'secret'") 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") remoteReleaseModules = flag.Bool("experimental-release", false, "enable experimental release modules")
...@@ -187,7 +187,7 @@ func start() { ...@@ -187,7 +187,7 @@ func start() {
logger.Printf("Starting Tiller %s (tls=%t)", version.GetVersion(), *tlsEnable || *tlsVerify) logger.Printf("Starting Tiller %s (tls=%t)", version.GetVersion(), *tlsEnable || *tlsVerify)
logger.Printf("GRPC listening on %s", *grpcAddr) 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("Storage driver is %s", env.Releases.Name())
logger.Printf("Max history per release is %d", *maxHistory) logger.Printf("Max history per release is %d", *maxHistory)
...@@ -213,7 +213,7 @@ func start() { ...@@ -213,7 +213,7 @@ func start() {
goprom.Register(rootServer) goprom.Register(rootServer)
addPrometheusHandler(mux) addPrometheusHandler(mux)
if err := http.ListenAndServe(probeAddr, mux); err != nil { if err := http.ListenAndServe(*probeAddr, mux); err != nil {
probeErrCh <- err probeErrCh <- err
} }
}() }()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment