Merge pull request #5612 from SataQiu/fix-20190418

Refactor: using tiller probe port constant (follow up of #5608)

cmd/helm/installer/install.go

@@ -228,7 +228,7 @@ func generateDeployment(opts *Options) (*v1beta1.Deployment, error) {
 							ImagePullPolicy: opts.pullPolicy(),
 							Ports: []v1.ContainerPort{
 								{ContainerPort: environment.DefaultTillerPort, Name: "tiller"},
-								{ContainerPort: 44135, Name: "http"},
+								{ContainerPort: environment.DefaultTillerProbePort, Name: "http"},
 							},
 							Env: []v1.EnvVar{
 								{Name: "TILLER_NAMESPACE", Value: opts.Namespace},
@@ -238,7 +238,7 @@ func generateDeployment(opts *Options) (*v1beta1.Deployment, error) {
 								Handler: v1.Handler{
 									HTTPGet: &v1.HTTPGetAction{
 										Path: "/liveness",
-										Port: intstr.FromInt(44135),
+										Port: intstr.FromInt(environment.DefaultTillerProbePort),
 									},
 								},
 								InitialDelaySeconds: 1,
@@ -248,7 +248,7 @@ func generateDeployment(opts *Options) (*v1beta1.Deployment, error) {
 								Handler: v1.Handler{
 									HTTPGet: &v1.HTTPGetAction{
 										Path: "/readiness",
-										Port: intstr.FromInt(44135),
+										Port: intstr.FromInt(environment.DefaultTillerProbePort),
 									},
 								},
 								InitialDelaySeconds: 1,

cmd/tiller/tiller.go

@@ -75,7 +75,7 @@ const (
 
 var (
 	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")
+	probeAddr            = flag.String("probe-listen", fmt.Sprintf(":%v", environment.DefaultTillerProbePort), "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'")
 	remoteReleaseModules = flag.Bool("experimental-release", false, "enable experimental release modules")

pkg/tiller/environment/environment.go

@@ -44,6 +44,9 @@ const (
 	// DefaultTillerPort defines the default port tiller listen on for client traffic
 	DefaultTillerPort = 44134
 
+	// DefaultTillerProbePort defines the default port to listen on for probes
+	DefaultTillerProbePort = 44135
+
 	// GoTplEngine is the name of the Go template engine, as registered in the EngineYard.
 	GoTplEngine = "gotpl"
 )