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
15b428d4
Commit
15b428d4
authored
Jul 06, 2016
by
Michelle Noorali
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(*): add version to release
laying ground work for #690
parent
e91bbcef
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
33 additions
and
22 deletions
+33
-22
release.proto
_proto/hapi/release/release.proto
+4
-0
get.go
cmd/helm/get.go
+2
-1
get_test.go
cmd/helm/get_test.go
+1
-1
helm_test.go
cmd/helm/helm_test.go
+2
-1
list.go
cmd/helm/list.go
+3
-2
list_test.go
cmd/helm/list_test.go
+2
-2
release_server.go
cmd/tiller/release_server.go
+1
-0
release.pb.go
pkg/proto/hapi/release/release.pb.go
+18
-15
No files found.
_proto/hapi/release/release.proto
View file @
15b428d4
...
@@ -44,4 +44,8 @@ message Release {
...
@@ -44,4 +44,8 @@ message Release {
// Hooks are all of the hooks declared for this release.
// Hooks are all of the hooks declared for this release.
repeated
hapi.release.Hook
hooks
=
6
;
repeated
hapi.release.Hook
hooks
=
6
;
// Version is an int32 which represents the version of the release.
int32
version
=
7
;
}
}
cmd/helm/get.go
View file @
15b428d4
...
@@ -92,8 +92,9 @@ func (g *getCmd) run() error {
...
@@ -92,8 +92,9 @@ func (g *getCmd) run() error {
return
err
return
err
}
}
fmt
.
Fprintf
(
g
.
out
,
"
CHART: %s-%s
\n
"
,
res
.
Release
.
Chart
.
Metadata
.
Name
,
res
.
Release
.
Chart
.
Metadata
.
Version
)
fmt
.
Fprintf
(
g
.
out
,
"
VERSION: %v
\n
"
,
res
.
Release
.
Version
)
fmt
.
Fprintf
(
g
.
out
,
"RELEASED: %s
\n
"
,
timeconv
.
Format
(
res
.
Release
.
Info
.
LastDeployed
,
time
.
ANSIC
))
fmt
.
Fprintf
(
g
.
out
,
"RELEASED: %s
\n
"
,
timeconv
.
Format
(
res
.
Release
.
Info
.
LastDeployed
,
time
.
ANSIC
))
fmt
.
Fprintf
(
g
.
out
,
"CHART: %s-%s
\n
"
,
res
.
Release
.
Chart
.
Metadata
.
Name
,
res
.
Release
.
Chart
.
Metadata
.
Version
)
fmt
.
Fprintln
(
g
.
out
,
"USER-SUPPLIED VALUES:"
)
fmt
.
Fprintln
(
g
.
out
,
"USER-SUPPLIED VALUES:"
)
fmt
.
Fprintln
(
g
.
out
,
res
.
Release
.
Config
.
Raw
)
fmt
.
Fprintln
(
g
.
out
,
res
.
Release
.
Config
.
Raw
)
fmt
.
Fprintln
(
g
.
out
,
"COMPUTED VALUES:"
)
fmt
.
Fprintln
(
g
.
out
,
"COMPUTED VALUES:"
)
...
...
cmd/helm/get_test.go
View file @
15b428d4
...
@@ -36,7 +36,7 @@ func TestGetCmd(t *testing.T) {
...
@@ -36,7 +36,7 @@ func TestGetCmd(t *testing.T) {
name
:
"with a release"
,
name
:
"with a release"
,
resp
:
releaseMock
(
"thomas-guide"
),
resp
:
releaseMock
(
"thomas-guide"
),
args
:
[]
string
{
"thomas-guide"
},
args
:
[]
string
{
"thomas-guide"
},
expected
:
"
CHART: foo-0.1.0-beta.1
\n
RELEASED: (.*)
\n
USER-SUPPLIED VALUES:
\n
name:
\"
value
\"\n
COMPUTED VALUES:
\n
name: value
\n\n
MANIFEST:"
,
expected
:
"
VERSION: 1
\n
RELEASED: (.*)
\n
CHART: foo-0.1.0-beta.1
\n
USER-SUPPLIED VALUES:
\n
name:
\"
value
\"\n
COMPUTED VALUES:
\n
name: value
\n\n
MANIFEST:"
,
},
},
{
{
name
:
"requires release name arg"
,
name
:
"requires release name arg"
,
...
...
cmd/helm/helm_test.go
View file @
15b428d4
...
@@ -43,7 +43,8 @@ func releaseMock(name string) *release.Release {
...
@@ -43,7 +43,8 @@ func releaseMock(name string) *release.Release {
{
Name
:
"foo.tpl"
,
Data
:
[]
byte
(
"Hello"
)},
{
Name
:
"foo.tpl"
,
Data
:
[]
byte
(
"Hello"
)},
},
},
},
},
Config
:
&
chart
.
Config
{
Raw
:
`name: "value"`
},
Config
:
&
chart
.
Config
{
Raw
:
`name: "value"`
},
Version
:
1
,
}
}
}
}
...
...
cmd/helm/list.go
View file @
15b428d4
...
@@ -141,12 +141,13 @@ func (l *listCmd) run() error {
...
@@ -141,12 +141,13 @@ func (l *listCmd) run() error {
func
formatList
(
rels
[]
*
release
.
Release
)
string
{
func
formatList
(
rels
[]
*
release
.
Release
)
string
{
table
:=
uitable
.
New
()
table
:=
uitable
.
New
()
table
.
MaxColWidth
=
30
table
.
MaxColWidth
=
30
table
.
AddRow
(
"NAME"
,
"UPDATED"
,
"STATUS"
,
"CHART"
)
table
.
AddRow
(
"NAME"
,
"
VERSION"
,
"
UPDATED"
,
"STATUS"
,
"CHART"
)
for
_
,
r
:=
range
rels
{
for
_
,
r
:=
range
rels
{
c
:=
fmt
.
Sprintf
(
"%s-%s"
,
r
.
Chart
.
Metadata
.
Name
,
r
.
Chart
.
Metadata
.
Version
)
c
:=
fmt
.
Sprintf
(
"%s-%s"
,
r
.
Chart
.
Metadata
.
Name
,
r
.
Chart
.
Metadata
.
Version
)
t
:=
timeconv
.
String
(
r
.
Info
.
LastDeployed
)
t
:=
timeconv
.
String
(
r
.
Info
.
LastDeployed
)
s
:=
r
.
Info
.
Status
.
Code
.
String
()
s
:=
r
.
Info
.
Status
.
Code
.
String
()
table
.
AddRow
(
r
.
Name
,
t
,
s
,
c
)
v
:=
r
.
Version
table
.
AddRow
(
r
.
Name
,
v
,
t
,
s
,
c
)
}
}
return
table
.
String
()
return
table
.
String
()
}
}
cmd/helm/list_test.go
View file @
15b428d4
...
@@ -52,7 +52,7 @@ func TestListRun(t *testing.T) {
...
@@ -52,7 +52,7 @@ func TestListRun(t *testing.T) {
},
},
long
:
true
,
long
:
true
,
},
},
expected
:
"NAME
\t
UPDATED
\t
STATUS
\t
CHART
\n
atlas
\t
(.*)
\t
DEPLOYED
\t
foo-0.1.0-beta.1
"
,
expected
:
"NAME
\t
VERSION
\t
UPDATED
\t
STATUS
\t
CHART
\n
atlas
\t
1
\t
(.*)
\t
DEPLOYED
\t
foo-0.1.0-beta.1
\n
"
,
},
},
}
}
...
@@ -93,7 +93,7 @@ func TestListCmd(t *testing.T) {
...
@@ -93,7 +93,7 @@ func TestListCmd(t *testing.T) {
resp
:
[]
*
release
.
Release
{
resp
:
[]
*
release
.
Release
{
releaseMock
(
"atlas"
),
releaseMock
(
"atlas"
),
},
},
expected
:
"NAME
\t
UPDATED
\t
STATUS
\t
CHART
\n
atlas
\t
(.*)
\t
DEPLOYED
\t
foo-0.1.0-beta.1
"
,
expected
:
"NAME
\t
VERSION
\t
UPDATED
\t
STATUS
\t
CHART
\n
atlas
\t
1
\t
(.*)
\t
DEPLOYED
\t
foo-0.1.0-beta.1
\n
"
,
},
},
}
}
...
...
cmd/tiller/release_server.go
View file @
15b428d4
...
@@ -277,6 +277,7 @@ func (s *releaseServer) prepareRelease(req *services.InstallReleaseRequest) (*re
...
@@ -277,6 +277,7 @@ func (s *releaseServer) prepareRelease(req *services.InstallReleaseRequest) (*re
},
},
Manifest
:
b
.
String
(),
Manifest
:
b
.
String
(),
Hooks
:
hooks
,
Hooks
:
hooks
,
Version
:
1
,
}
}
return
rel
,
nil
return
rel
,
nil
}
}
...
...
pkg/proto/hapi/release/release.pb.go
View file @
15b428d4
...
@@ -31,6 +31,8 @@ type Release struct {
...
@@ -31,6 +31,8 @@ type Release struct {
Manifest
string
`protobuf:"bytes,5,opt,name=manifest" json:"manifest,omitempty"`
Manifest
string
`protobuf:"bytes,5,opt,name=manifest" json:"manifest,omitempty"`
// Hooks are all of the hooks declared for this release.
// Hooks are all of the hooks declared for this release.
Hooks
[]
*
Hook
`protobuf:"bytes,6,rep,name=hooks" json:"hooks,omitempty"`
Hooks
[]
*
Hook
`protobuf:"bytes,6,rep,name=hooks" json:"hooks,omitempty"`
// Version is an int32 which represents the version of the release.
Version
int32
`protobuf:"varint,7,opt,name=version" json:"version,omitempty"`
}
}
func
(
m
*
Release
)
Reset
()
{
*
m
=
Release
{}
}
func
(
m
*
Release
)
Reset
()
{
*
m
=
Release
{}
}
...
@@ -71,19 +73,20 @@ func init() {
...
@@ -71,19 +73,20 @@ func init() {
}
}
var
fileDescriptor2
=
[]
byte
{
var
fileDescriptor2
=
[]
byte
{
// 224 bytes of a gzipped FileDescriptorProto
// 239 bytes of a gzipped FileDescriptorProto
0x1f
,
0x8b
,
0x08
,
0x00
,
0x00
,
0x09
,
0x6e
,
0x88
,
0x02
,
0xff
,
0x64
,
0x90
,
0x3f
,
0x4f
,
0x85
,
0x30
,
0x1f
,
0x8b
,
0x08
,
0x00
,
0x00
,
0x09
,
0x6e
,
0x88
,
0x02
,
0xff
,
0x64
,
0x90
,
0x3f
,
0x4f
,
0x03
,
0x31
,
0x14
,
0xc5
,
0x83
,
0xfc
,
0x93
,
0xab
,
0x8b
,
0x77
,
0xd0
,
0x86
,
0x89
,
0x38
,
0x28
,
0x71
,
0x28
,
0x89
,
0x0c
,
0xc5
,
0x75
,
0xf4
,
0xfe
,
0x50
,
0xc3
,
0x82
,
0x07
,
0xb0
,
0x6e
,
0xaa
,
0x18
,
0xa0
,
0x62
,
0x48
,
0x7e
,
0x03
,
0x5d
,
0x74
,
0xed
,
0xe8
,
0x56
,
0x49
,
0x91
,
0x46
,
0x69
,
0x09
,
0xf0
,
0x81
,
0xfd
,
0x28
,
0x25
,
0xf8
,
0x06
,
0xb0
,
0xc0
,
0x9a
,
0x91
,
0x2d
,
0x54
,
0x39
,
0x2e
,
0x82
,
0x26
,
0x55
,
0x72
,
0xe2
,
0xd2
,
0xde
,
0xbe
,
0x17
,
0x78
,
0x6f
,
0xb9
,
0x6d
,
0xcf
,
0xef
,
0xe4
,
0xf4
,
0xb4
,
0x50
,
0xf6
,
0x72
,
0xc3
,
0x33
,
0x91
,
0xc4
,
0x29
,
0xba
,
0xc2
,
0xe2
,
0xc4
,
0xfe
,
0xbd
,
0xbc
,
0x3c
,
0x19
,
0xfa
,
0x51
,
0xd4
,
0xcd
,
0xa4
,
0x7e
,
0x95
,
0x9c
,
0xd5
,
0x61
,
0xe5
,
0xe3
,
0x64
,
0x17
,
0x8b
,
0xd7
,
0x8e
,
0xf1
,
0xed
,
0xcd
,
0xc6
,
0xeb
,
0x4f
,
0xad
,
0x82
,
0x3e
,
0x9c
,
0x62
,
0xef
,
0xdd
,
0xe4
,
0xf0
,
0x3c
,
0x31
,
0xa0
,
0x95
,
0x77
,
0x3b
,
0x67
,
0x6f
,
0xed
,
0x0f
,
0xd9
,
0x4e
,
0x80
,
0x36
,
0x9d
,
0xdd
,
0x81
,
0xb6
,
0x51
,
0x66
,
0xfd
,
0xd5
,
0x91
,
0x72
,
0x74
,
0xee
,
0x83
,
0x65
,
0x7f
,
0x80
,
0xb1
,
0x83
,
0x3b
,
0x02
,
0x97
,
0xd3
,
0xd2
,
0xb4
,
0xd6
,
0x74
,
0xfa
,
0x3b
,
0x80
,
0xdb
,
0x2d
,
0x70
,
0x93
,
0xf4
,
0xfb
,
0xbf
,
0xdb
,
0x51
,
0xf9
,
0x69
,
0xb3
,
0x75
,
0x76
,
0x30
,
0xef
,
0x05
,
0x5c
,
0xce
,
0x41
,
0xaa
,
0x3c
,
0xbf
,
0x08
,
0x72
,
0x41
,
0x39
,
0x88
,
0x90
,
0x18
,
0x39
,
0x28
,
0x16
,
0x55
,
0x51
,
0x5d
,
0x08
,
0xbf
,
0xc7
,
0xfe
,
0xae
,
0xa0
,
0x93
,
0xec
,
0x83
,
0x08
,
0xb5
,
0x55
,
0x3b
,
0x4d
,
0xd5
,
0xaa
,
0x5a
,
0x2f
,
0x65
,
0x07
,
0x48
,
0x5c
,
0x3c
,
0xbb
,
0x58
,
0xb5
,
0xab
,
0x67
,
0xe4
,
0xdb
,
0x7e
,
0xfc
,
0x63
,
0x25
,
0xc2
,
0xbe
,
0xe3
,
0x0d
,
0xd4
,
0xc9
,
0x9e
,
0x4e
,
0xe2
,
0xec
,
0xec
,
0x1e
,
0xc5
,
0x3c
,
0x9f
,
0x78
,
0x89
,
0x73
,
0x7c
,
0x84
,
0xd4
,
0xc7
,
0xb2
,
0xd8
,
0x1b
,
0x6f
,
0xc8
,
0x48
,
0x37
,
0xbd
,
0xb9
,
0x29
,
0x88
,
0x44
,
0x66
,
0x8e
,
0xb7
,
0xd0
,
0x64
,
0x5b
,
0x5a
,
0x64
,
0xe1
,
0x05
,
0x0b
,
0xf9
,
0xa7
,
0xa7
,
0x54
,
0xe3
,
0x13
,
0x64
,
0x54
,
0x8c
,
0x25
,
0xdb
,
0xc8
,
0xe0
,
0xf4
,
0x44
,
0x04
,
0x07
,
0x96
,
0x70
,
0x39
,
0x25
,
0x73
,
0xbc
,
0x83
,
0x96
,
0x83
,
0x51
,
0x3d
,
0xb7
,
0x2c
,
0xca
,
0x4c
,
0x64
,
0x51
,
0x60
,
0x0f
,
0x48
,
0xa3
,
0x3b
,
0x35
,
0x2f
,
0x2c
,
0xf5
,
0xa5
,
0x8e
,
0x67
,
0xac
,
0x21
,
0x75
,
0x1f
,
0x32
,
0xb3
,
0xa7
,
0x3b
,
0x65
,
0xcd
,
0xa0
,
0xc3
,
0x44
,
0x4d
,
0x0e
,
0xf5
,
0xdb
,
0xe3
,
0x1a
,
0x9a
,
0xb4
,
0x90
,
0xac
,
0x8a
,
0xcf
,
0x9b
,
0xbd
,
0xaf
,
0x48
,
0x90
,
0xe1
,
0xb5
,
0xf8
,
0xcc
,
0x83
,
0xfc
,
0x95
,
0xf9
,
0x40
,
0xed
,
0x6a
,
0xf1
,
0x3f
,
0xd9
,
0x73
,
0x44
,
0x92
,
0x05
,
0x48
,
0xd0
,
0x7d
,
0x69
,
0x1f
,
0x8c
,
0x47
,
0xbf
,
0xfc
,
0x07
,
0x00
,
0x00
,
0xff
,
0xff
,
0x96
,
0x35
,
0x9e
,
0xef
,
0x83
,
0x01
,
0x00
,
0x00
,
0xb3
,
0xd4
,
0x45
,
0x93
,
0x46
,
0x1e
,
0xda
,
0xc7
,
0xe5
,
0x6b
,
0x57
,
0x1e
,
0xbc
,
0xb5
,
0x79
,
0x1d
,
0x0f
,
0x3f
,
0x01
,
0x00
,
0x00
,
0xff
,
0xff
,
0x49
,
0x8d
,
0x14
,
0x1a
,
0x9d
,
0x01
,
0x00
,
0x00
,
}
}
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