Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
H
helm3
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
helm3
Commits
06fbc720
Commit
06fbc720
authored
Apr 18, 2019
by
SataQiu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor: using tiller probe port constant
Signed-off-by:
SataQiu
<
qiushida@beyondcent.com
>
parent
c645373e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
install.go
cmd/helm/installer/install.go
+3
-3
tiller.go
cmd/tiller/tiller.go
+1
-1
environment.go
pkg/tiller/environment/environment.go
+3
-0
No files found.
cmd/helm/installer/install.go
View file @
06fbc720
...
@@ -228,7 +228,7 @@ func generateDeployment(opts *Options) (*v1beta1.Deployment, error) {
...
@@ -228,7 +228,7 @@ func generateDeployment(opts *Options) (*v1beta1.Deployment, error) {
ImagePullPolicy
:
opts
.
pullPolicy
(),
ImagePullPolicy
:
opts
.
pullPolicy
(),
Ports
:
[]
v1
.
ContainerPort
{
Ports
:
[]
v1
.
ContainerPort
{
{
ContainerPort
:
environment
.
DefaultTillerPort
,
Name
:
"tiller"
},
{
ContainerPort
:
environment
.
DefaultTillerPort
,
Name
:
"tiller"
},
{
ContainerPort
:
44135
,
Name
:
"http"
},
{
ContainerPort
:
environment
.
DefaultTillerProbePort
,
Name
:
"http"
},
},
},
Env
:
[]
v1
.
EnvVar
{
Env
:
[]
v1
.
EnvVar
{
{
Name
:
"TILLER_NAMESPACE"
,
Value
:
opts
.
Namespace
},
{
Name
:
"TILLER_NAMESPACE"
,
Value
:
opts
.
Namespace
},
...
@@ -238,7 +238,7 @@ func generateDeployment(opts *Options) (*v1beta1.Deployment, error) {
...
@@ -238,7 +238,7 @@ func generateDeployment(opts *Options) (*v1beta1.Deployment, error) {
Handler
:
v1
.
Handler
{
Handler
:
v1
.
Handler
{
HTTPGet
:
&
v1
.
HTTPGetAction
{
HTTPGet
:
&
v1
.
HTTPGetAction
{
Path
:
"/liveness"
,
Path
:
"/liveness"
,
Port
:
intstr
.
FromInt
(
44135
),
Port
:
intstr
.
FromInt
(
environment
.
DefaultTillerProbePort
),
},
},
},
},
InitialDelaySeconds
:
1
,
InitialDelaySeconds
:
1
,
...
@@ -248,7 +248,7 @@ func generateDeployment(opts *Options) (*v1beta1.Deployment, error) {
...
@@ -248,7 +248,7 @@ func generateDeployment(opts *Options) (*v1beta1.Deployment, error) {
Handler
:
v1
.
Handler
{
Handler
:
v1
.
Handler
{
HTTPGet
:
&
v1
.
HTTPGetAction
{
HTTPGet
:
&
v1
.
HTTPGetAction
{
Path
:
"/readiness"
,
Path
:
"/readiness"
,
Port
:
intstr
.
FromInt
(
44135
),
Port
:
intstr
.
FromInt
(
environment
.
DefaultTillerProbePort
),
},
},
},
},
InitialDelaySeconds
:
1
,
InitialDelaySeconds
:
1
,
...
...
cmd/tiller/tiller.go
View file @
06fbc720
...
@@ -75,7 +75,7 @@ const (
...
@@ -75,7 +75,7 @@ const (
var
(
var
(
grpcAddr
=
flag
.
String
(
"listen"
,
fmt
.
Sprintf
(
":%v"
,
environment
.
DefaultTillerPort
),
"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"
)
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"
)
enableTracing
=
flag
.
Bool
(
"trace"
,
false
,
"enable rpc tracing"
)
store
=
flag
.
String
(
"storage"
,
storageConfigMap
,
"storage driver to use. One of 'configmap', 'memory', or 'secret'"
)
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"
)
remoteReleaseModules
=
flag
.
Bool
(
"experimental-release"
,
false
,
"enable experimental release modules"
)
...
...
pkg/tiller/environment/environment.go
View file @
06fbc720
...
@@ -44,6 +44,9 @@ const (
...
@@ -44,6 +44,9 @@ const (
// DefaultTillerPort defines the default port tiller listen on for client traffic
// DefaultTillerPort defines the default port tiller listen on for client traffic
DefaultTillerPort
=
44134
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 is the name of the Go template engine, as registered in the EngineYard.
GoTplEngine
=
"gotpl"
GoTplEngine
=
"gotpl"
)
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment