upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-02-20 08:29:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix(chartutil): restore .Release.Revision

Browse source 
Signed-off-by: Matthew Fisher <matt.fisher@microsoft.com>
This commit is contained in:
Matthew Fisher 2019-10-17 11:04:45 -07:00
parent b42967ff51
commit 402fce389a
No known key found for this signature in database
GPG key ID: 92AA783CBAAE8E3B
4 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkg/action/install.go
View file

@ -200,6 +200,7 @@ func (i *Install) Run(chrt *chart.Chart, vals map[string]interface{}) (*release.
options := chartutil.ReleaseOptions{
Name: i.ReleaseName,
Namespace: i.Namespace,
Revision: 1,
IsInstall: true,
}
valuesToRender, err := chartutil.ToRenderValues(chrt, vals, options, caps)

1
pkg/action/upgrade.go
View file

@ -147,6 +147,7 @@ func (u *Upgrade) prepareUpgrade(name string, chart *chart.Chart, vals map[strin
options := chartutil.ReleaseOptions{
Name: name,
Namespace: currentRelease.Namespace,
Revision: revision,
IsUpgrade: true,
}

2
pkg/chartutil/values.go
View file

@ -130,6 +130,7 @@ func ReadValuesFile(filename string) (Values, error) {
type ReleaseOptions struct {
Name string
Namespace string
Revision int
IsUpgrade bool
IsInstall bool
}
@ -149,6 +150,7 @@ func ToRenderValues(chrt *chart.Chart, chrtVals map[string]interface{}, options
"Namespace": options.Namespace,
"IsUpgrade": options.IsUpgrade,
"IsInstall": options.IsInstall,
"Revision": options.Revision,
"Service": "Helm",
},
}

8
pkg/chartutil/values_test.go
View file

@ -99,6 +99,8 @@ func TestToRenderValues(t *testing.T) {
o := ReleaseOptions{
Name: "Seven Voyages",
Namespace: "default",
Revision: 1,
IsInstall: true,
}
@ -115,6 +117,12 @@ func TestToRenderValues(t *testing.T) {
if name := relmap["Name"]; name.(string) != "Seven Voyages" {
t.Errorf("Expected release name 'Seven Voyages', got %q", name)
}
if namespace := relmap["Namespace"]; namespace.(string) != "default" {
t.Errorf("Expected namespace 'default', got %q", namespace)
}
if revision := relmap["Revision"]; revision.(int) != 1 {
t.Errorf("Expected revision '1', got %d", revision)
}
if relmap["IsUpgrade"].(bool) {
t.Error("Expected upgrade to be false.")
}