From 06fbc720e775b1ec4fe8db47d98fc404fdbaad52 Mon Sep 17 00:00:00 2001 From: SataQiu Date: Thu, 18 Apr 2019 14:14:32 +0800 Subject: [PATCH] refactor: using tiller probe port constant Signed-off-by: SataQiu --- cmd/helm/installer/install.go | 6 +++--- cmd/tiller/tiller.go | 2 +- pkg/tiller/environment/environment.go | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cmd/helm/installer/install.go b/cmd/helm/installer/install.go index 04f9f9b19..5c3369c7d 100644 --- a/cmd/helm/installer/install.go +++ b/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, diff --git a/cmd/tiller/tiller.go b/cmd/tiller/tiller.go index f961d6871..ba26cc238 100644 --- a/cmd/tiller/tiller.go +++ b/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") diff --git a/pkg/tiller/environment/environment.go b/pkg/tiller/environment/environment.go index b237c53cc..21c23d421 100644 --- a/pkg/tiller/environment/environment.go +++ b/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" )