Skip to content

H
helm3
Commit 926ec0ef authored by Yusuke Kuoka's avatar Yusuke Kuoka
Browse files
Options

fixup! Merge branch 'master' into togglable-tiller-probe-endpoints 

Signed-off-by: 's avatarYusuke Kuoka <ykuoka@gmail.com>
parent 3d8f8b86
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
cmd/tiller/tiller.go
View file @ 926ec0ef
...@@ -75,11 +75,11 @@ const ( ...@@ -75,11 +75,11 @@ const (
) )
var ( var (
grpcAddr = flag.String("listen", fmt.Sprintf(":%v", environment.DefaultTillerPort), "address:port to listen on") grpcAddr = flag.String("listen", fmt.Sprintf(":%v", environment.DefaultTillerPort), "address:port to listen on")
probeAddr = flag.String("probe-listen", fmt.Sprintf(":%v", environment.DefaultTillerProbePort), "address:port to listen on for probes") probeAddr = flag.String("probe-listen", fmt.Sprintf(":%v", environment.DefaultTillerProbePort), "address:port to listen on for probes")
enableProbing = flag.Bool("probe", true, "enable probing over http") enableProbing = flag.Bool("probe", true, "enable probing over http")
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', 'sql' or 'secret'") store = flag.String("storage", storageConfigMap, "storage driver to use. One of 'configmap', 'memory', 'sql' or 'secret'")
sqlDialect = flag.String("sql-dialect", "postgres", "SQL dialect to use (only postgres is supported for now") sqlDialect = flag.String("sql-dialect", "postgres", "SQL dialect to use (only postgres is supported for now")
sqlConnectionString = flag.String("sql-connection-string", "", "SQL connection string to use") sqlConnectionString = flag.String("sql-connection-string", "", "SQL connection string to use")
......
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