Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
1105 Внедрение механизмов обеспечения безопасности цепочки поставки программных проектов
Legacy
scanned-projects
helm
Commits
e48a3be6
Commit
e48a3be6
authored
6 years ago
by
SataQiu
Browse files
Options
Download
Patches
Plain Diff
define port 44134 as a constant
Signed-off-by:
SataQiu
<
qiushida@beyondcent.com
>
parent
bacb6ceb
release-2.17
dev-v2
release-2.14
release-2.15
release-2.16
v2.17.0
v2.17.0-rc.1
v2.16.12
v2.16.11
v2.16.10
v2.16.9
v2.16.8
v2.16.7
v2.16.6
v2.16.5
v2.16.4
v2.16.3
v2.16.2
v2.16.1
v2.16.0
v2.16.0-rc.2
v2.16.0-rc.1
v2.15.2
v2.15.1
v2.15.0
v2.15.0-rc.2
v2.15.0-rc.1
v2.14.3
v2.14.2
v2.14.1
v2.14.0
v2.14.0-rc.2
v2.14.0-rc.1
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
cmd/helm/installer/install.go
+3
-2
cmd/helm/installer/install.go
cmd/tiller/tiller.go
+1
-1
cmd/tiller/tiller.go
pkg/helm/portforwarder/portforwarder.go
+2
-2
pkg/helm/portforwarder/portforwarder.go
pkg/tiller/environment/environment.go
+3
-0
pkg/tiller/environment/environment.go
with
9 additions
and
5 deletions
+9
-5
cmd/helm/installer/install.go
+
3
−
2
View file @
e48a3be6
...
...
@@ -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"
),
},
},
...
...
This diff is collapsed.
Click to expand it.
cmd/tiller/tiller.go
+
1
−
1
View file @
e48a3be6
...
...
@@ -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'"
)
...
...
This diff is collapsed.
Click to expand it.
pkg/helm/portforwarder/portforwarder.go
+
2
−
2
View file @
e48a3be6
...
...
@@ -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
()
}
...
...
This diff is collapsed.
Click to expand it.
pkg/tiller/environment/environment.go
+
3
−
0
View file @
e48a3be6
...
...
@@ -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"
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets