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
50b56efc
Commit
50b56efc
authored
9 years ago
by
Matt Butcher
Browse files
Options
Download
Plain Diff
Merge pull request #40 from technosophos/feat/tiller-cobra
fix(tiller): replace codegangsta with cobra
parents
4593fc48
33a543c9
main
Release
add-codeql
dependabot/go_modules/github.com/docker/distribution-2.8.2incompatible
dependabot/go_modules/github.com/lib/pq-1.10.9
dependabot/go_modules/github.com/rubenv/sql-migrate-1.4.0
dependabot/go_modules/golang.org/x/crypto-0.9.0
dependabot/go_modules/golang.org/x/term-0.8.0
dependabot/go_modules/k8s.io/klog/v2-2.100.1
dev-v2
feat-v3/event-emitter-lua
kube-update-test
release-2.0
release-2.1
release-2.10
release-2.11
release-2.12
release-2.13
release-2.14
release-2.15
release-2.16
release-2.17
release-2.2
release-2.3
release-2.4
release-2.5
release-2.6
release-2.7
release-2.8
release-2.9
release-3.0
release-3.1
release-3.10
release-3.11
release-3.12
release-3.2
release-3.3
release-3.4
release-3.5
release-3.6
release-3.6.1
release-3.6.2
release-3.7
release-3.8
release-3.9
release-v3.0.0-beta.4
v3.12.0
v3.12.0-rc.1
v3.12.0-dev.1
v3.11.3
v3.11.2
v3.11.1
v3.11.0
v3.11.0-rc.2
v3.11.0-rc.1
v3.10.3
v3.10.2
v3.10.1
v3.10.0
v3.10.0-rc.1
v3.9.4
v3.9.3
v3.9.2
v3.9.1
v3.9.0
v3.9.0-rc.1
v3.8.2
v3.8.1
v3.8.0
v3.8.0-rc.2
v3.8.0-rc.1
v3.7.2
v3.7.1
v3.7.0
v3.7.0-rc.3
v3.7.0-rc.2
v3.7.0-rc.1
v3.6.3
v3.6.2
v3.6.1
v3.6.0
v3.6.0-rc.1
v3.5.4
v3.5.3
v3.5.2
v3.5.1
v3.5.0
v3.5.0-rc.2
v3.5.0-rc.1
v3.4.2
v3.4.1
v3.4.0
v3.4.0-rc.1
v3.3.4
v3.3.3
v3.3.2
v3.3.1
v3.3.0
v3.3.0-rc.2
v3.3.0-rc.1
v3.2.4
v3.2.3
v3.2.2
v3.2.1
v3.2.0
v3.2.0-rc.1
v3.1.3
v3.1.2
v3.1.1
v3.1.0
v3.1.0-rc.3
v3.1.0-rc.2
v3.1.0-rc.1
v3.0.3
v3.0.2
v3.0.1
v3.0.0
v3.0.0-rc.4
v3.0.0-rc.3
v3.0.0-rc.2
v3.0.0-rc.1
v3.0.0-beta.5
v3.0.0-beta.4
v3.0.0-beta.3
v3.0.0-beta.2
v3.0.0-beta.1
v3.0.0-alpha.2
v3.0.0-alpha.1
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
v2.13.1
v2.13.1-rc.1
v2.13.0
v2.13.0-rc.2
v2.13.0-rc.1
v2.12.3
v2.12.2
v2.12.1
v2.12.0
v2.12.0-rc.2
v2.12.0-rc.1
v2.11.0
v2.11.0-rc.4
v2.11.0-rc.3
v2.11.0-rc.2
v2.11.0-rc.1
v2.10.0
v2.10.0-rc.3
v2.10.0-rc.2
v2.10.0-rc.1
v2.9.1
v2.9.0
v2.9.0-rc5
v2.9.0-rc4
v2.9.0-rc3
v2.9.0-rc2
v2.9.0-rc1
v2.8.2
v2.8.2-rc1
v2.8.1
v2.8.0
v2.8.0-rc.1
v2.7.2
v2.7.1
v2.7.0
v2.7.0-rc1
v2.6.2
v2.6.1
v2.6.0
v2.5.1
v2.5.0
v2.4.2
v2.4.1
v2.4.0
v2.3.1
v2.3.0
v2.2.3
v2.2.2
v2.2.1
v2.2.0
v2.1.3
v2.1.2
v2.1.1
v2.1.0
v2.0.2
v2.0.1
v2.0.0
v2.0.0-rc.2
v2.0.0-rc.1
v2.0.0-beta.2
v2.0.0-beta.1
v2.0.0-alpha.5
v2.0.0-alpha.4
v2.0.0-alpha.3
v2.0.0-alpha.2
v2.0.0-alpha.1
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
cmd/tiller/tiller.go
+17
-8
cmd/tiller/tiller.go
glide.lock
+2
-4
glide.lock
glide.yaml
+4
-1
glide.yaml
with
23 additions
and
13 deletions
+23
-13
cmd/tiller/tiller.go
+
17
−
8
View file @
50b56efc
...
@@ -5,8 +5,8 @@ import (
...
@@ -5,8 +5,8 @@ import (
"net"
"net"
"os"
"os"
"github.com/codegangsta/cli"
"github.com/deis/tiller/cmd/tiller/environment"
"github.com/deis/tiller/cmd/tiller/environment"
"github.com/spf13/cobra"
"google.golang.org/grpc"
"google.golang.org/grpc"
)
)
...
@@ -16,16 +16,25 @@ import (
...
@@ -16,16 +16,25 @@ import (
var
rootServer
*
grpc
.
Server
=
grpc
.
NewServer
()
var
rootServer
*
grpc
.
Server
=
grpc
.
NewServer
()
var
env
=
environment
.
New
()
var
env
=
environment
.
New
()
func
main
()
{
const
globalUsage
=
`The Kubernetes Helm server.
app
:=
cli
.
NewApp
()
app
.
Name
=
"tiller"
Tiller is the server for Helm. It provides in-cluster resource management.
app
.
Usage
=
`The Helm server.`
app
.
Action
=
start
By default, Tiller listens for gRPC connections on port 44134.
`
app
.
Run
(
os
.
Args
)
var
rootCommand
=
&
cobra
.
Command
{
Use
:
"tiller"
,
Short
:
"The Kubernetes Helm server."
,
Long
:
globalUsage
,
Run
:
start
,
}
func
main
()
{
rootCommand
.
Execute
()
}
}
func
start
(
c
*
c
li
.
Context
)
{
func
start
(
c
*
c
obra
.
Command
,
args
[]
string
)
{
addr
:=
":44134"
addr
:=
":44134"
lstn
,
err
:=
net
.
Listen
(
"tcp"
,
addr
)
lstn
,
err
:=
net
.
Listen
(
"tcp"
,
addr
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
This diff is collapsed.
Click to expand it.
glide.lock
+
2
−
4
View file @
50b56efc
hash: 2
64d156a2a07d53efbf5f608ead3eb31c261de5124e0235139b3f99c6ead4dba
hash: 2
3af9670ae8c1600f0f3c70bd9191e0df9211fed1e57430160aed95d5c71c2d1
updated: 2016-04-
18
T17:
25:07.66294208
8-06:00
updated: 2016-04-
20
T17:
16:04.78283962
8-06:00
imports:
imports:
- name: github.com/aokoli/goutils
- name: github.com/aokoli/goutils
version: 9c37978a95bd5c709a15883b6242714ea6709e64
version: 9c37978a95bd5c709a15883b6242714ea6709e64
- name: github.com/BurntSushi/toml
- name: github.com/BurntSushi/toml
version: bbd5bb678321a0d6e58f1099321dfa73391c1b6f
version: bbd5bb678321a0d6e58f1099321dfa73391c1b6f
- name: github.com/codegangsta/cli
version: 71f57d300dd6a780ac1856c005c4b518cfd498ec
- name: github.com/golang/protobuf
- name: github.com/golang/protobuf
version: f0a097ddac24fb00e07d2ac17f8671423f3ea47c
version: f0a097ddac24fb00e07d2ac17f8671423f3ea47c
subpackages:
subpackages:
...
...
This diff is collapsed.
Click to expand it.
glide.yaml
+
4
−
1
View file @
50b56efc
package
:
github.com/deis/tiller
package
:
github.com/deis/tiller
import
:
import
:
-
package
:
google.golang.org/grpc
-
package
:
golang.org/x/net
-
package
:
golang.org/x/net
subpackages
:
subpackages
:
-
context
-
context
...
@@ -14,3 +13,7 @@ import:
...
@@ -14,3 +13,7 @@ import:
version
:
1.1.0
version
:
1.1.0
-
package
:
github.com/BurntSushi/toml
-
package
:
github.com/BurntSushi/toml
-
package
:
github.com/technosophos/moniker
-
package
:
github.com/technosophos/moniker
-
package
:
github.com/golang/protobuf
version
:
f0a097ddac24fb00e07d2ac17f8671423f3ea47c
-
package
:
google.golang.org/grpc
version
:
dec33edc378cf4971a2741cfd86ed70a644d6ba3
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