From e48a3be64af498c2a8891ca9244741f5ea1d26cc Mon Sep 17 00:00:00 2001
From: SataQiu <qiushida@beyondcent.com>
Date: Thu, 18 Apr 2019 10:51:34 +0800
Subject: [PATCH] define port 44134 as a constant

Signed-off-by: SataQiu <qiushida@beyondcent.com>
---
 cmd/helm/installer/install.go           | 5 +++--
 cmd/tiller/tiller.go                    | 2 +-
 pkg/helm/portforwarder/portforwarder.go | 4 ++--
 pkg/tiller/environment/environment.go   | 3 +++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/cmd/helm/installer/install.go b/cmd/helm/installer/install.go
index d6d24eec4..04f9f9b19 100644
--- a/cmd/helm/installer/install.go
+++ b/cmd/helm/installer/install.go
@@ -36,6 +36,7 @@ import (
 	"k8s.io/helm/pkg/version"
 
 	"k8s.io/helm/pkg/chartutil"
+	"k8s.io/helm/pkg/tiller/environment"
 )
 
 // Install uses Kubernetes client to install Tiller.
@@ -226,7 +227,7 @@ func generateDeployment(opts *Options) (*v1beta1.Deployment, error) {
 							Image:           opts.SelectImage(),
 							ImagePullPolicy: opts.pullPolicy(),
 							Ports: []v1.ContainerPort{
-								{ContainerPort: 44134, Name: "tiller"},
+								{ContainerPort: environment.DefaultTillerPort, Name: "tiller"},
 								{ContainerPort: 44135, Name: "http"},
 							},
 							Env: []v1.EnvVar{
@@ -341,7 +342,7 @@ func generateService(namespace string) *v1.Service {
 			Ports: []v1.ServicePort{
 				{
 					Name:       "tiller",
-					Port:       44134,
+					Port:       environment.DefaultTillerPort,
 					TargetPort: intstr.FromString("tiller"),
 				},
 			},
diff --git a/cmd/tiller/tiller.go b/cmd/tiller/tiller.go
index f3ba197b5..f961d6871 100644
--- a/cmd/tiller/tiller.go
+++ b/cmd/tiller/tiller.go
@@ -74,7 +74,7 @@ const (
 )
 
 var (
-	grpcAddr             = flag.String("listen", ":44134", "address:port to listen on")
+	grpcAddr             = flag.String("listen", fmt.Sprintf(":%v", environment.DefaultTillerPort), "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'")
diff --git a/pkg/helm/portforwarder/portforwarder.go b/pkg/helm/portforwarder/portforwarder.go
index e962eef7f..0b04478f5 100644
--- a/pkg/helm/portforwarder/portforwarder.go
+++ b/pkg/helm/portforwarder/portforwarder.go
@@ -27,6 +27,7 @@ import (
 	"k8s.io/client-go/rest"
 
 	"k8s.io/helm/pkg/kube"
+	"k8s.io/helm/pkg/tiller/environment"
 )
 
 var (
@@ -39,8 +40,7 @@ func New(namespace string, client kubernetes.Interface, config *rest.Config) (*k
 	if err != nil {
 		return nil, err
 	}
-	const tillerPort = 44134
-	t := kube.NewTunnel(client.CoreV1().RESTClient(), config, namespace, podName, tillerPort)
+	t := kube.NewTunnel(client.CoreV1().RESTClient(), config, namespace, podName, environment.DefaultTillerPort)
 	return t, t.ForwardPort()
 }
 
diff --git a/pkg/tiller/environment/environment.go b/pkg/tiller/environment/environment.go
index 28d4843a3..b237c53cc 100644
--- a/pkg/tiller/environment/environment.go
+++ b/pkg/tiller/environment/environment.go
@@ -41,6 +41,9 @@ const (
 	// DefaultTillerNamespace is the default namespace for Tiller.
 	DefaultTillerNamespace = "kube-system"
 
+	// DefaultTillerPort defines the default port tiller listen on for client traffic
+	DefaultTillerPort = 44134
+
 	// GoTplEngine is the name of the Go template engine, as registered in the EngineYard.
 	GoTplEngine = "gotpl"
 )