From 67bd026840a98c0ddc057c1c2368432a8deead0e Mon Sep 17 00:00:00 2001
From: Matt Butcher <mbutcher@engineyard.com>
Date: Thu, 28 Apr 2016 15:05:26 -0600
Subject: [PATCH] fix(tiller): pass address and port via flag
---
cmd/tiller/tiller.go | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/cmd/tiller/tiller.go b/cmd/tiller/tiller.go
index d1fda6c8f..8e43e30d2 100644
--- a/cmd/tiller/tiller.go
+++ b/cmd/tiller/tiller.go
@@ -14,8 +14,14 @@ import (
//
// Each gRPC service registers itself to this server during init().
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 addr = ":44134"
+
const globalUsage = `The Kubernetes Helm server.
Tiller is the server for Helm. It provides in-cluster resource management.
@@ -31,11 +37,11 @@ var rootCommand = &cobra.Command{
}
func main() {
+ rootCommand.PersistentFlags().StringVarP(&addr, "listen", "l", ":44134", "The address:port to listen on")
rootCommand.Execute()
}
func start(c *cobra.Command, args []string) {
- addr := ":44134"
lstn, err := net.Listen("tcp", addr)
if err != nil {
fmt.Fprintf(os.Stderr, "Server died: %s\n", err)
--
GitLab