Commit fa0982ac authored by Matt Butcher's avatar Matt Butcher

Merge pull request #617 from technosophos/feat/tiller-flags

fix(tiller): pass address and port via flag
parents f3b225fe 67bd0268
...@@ -14,8 +14,14 @@ import ( ...@@ -14,8 +14,14 @@ import (
// //
// Each gRPC service registers itself to this server during init(). // Each gRPC service registers itself to this server during init().
var rootServer = grpc.NewServer() var rootServer = grpc.NewServer()
// env is the default environment.
//
// Any changes to env should be done before rootServer.Serve() is called.
var env = environment.New() var env = environment.New()
var addr = ":44134"
const globalUsage = `The Kubernetes Helm server. const globalUsage = `The Kubernetes Helm server.
Tiller is the server for Helm. It provides in-cluster resource management. Tiller is the server for Helm. It provides in-cluster resource management.
...@@ -31,11 +37,11 @@ var rootCommand = &cobra.Command{ ...@@ -31,11 +37,11 @@ var rootCommand = &cobra.Command{
} }
func main() { func main() {
rootCommand.PersistentFlags().StringVarP(&addr, "listen", "l", ":44134", "The address:port to listen on")
rootCommand.Execute() rootCommand.Execute()
} }
func start(c *cobra.Command, args []string) { func start(c *cobra.Command, args []string) {
addr := ":44134"
lstn, err := net.Listen("tcp", addr) lstn, err := net.Listen("tcp", addr)
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "Server died: %s\n", err) fmt.Fprintf(os.Stderr, "Server died: %s\n", 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