diff --git a/cmd/helm/get_values.go b/cmd/helm/get_values.go
index 8282fbf2b76e2f1cbbe22078afac554c2035e63c..292a6ca987b8ed98c21d9ca5339ff4c68efc3a13 100644
--- a/cmd/helm/get_values.go
+++ b/cmd/helm/get_values.go
@@ -83,6 +83,6 @@ func (g *getValuesCmd) run() error {
return nil
}
- fmt.Fprintln(g.out, res.Config.Raw)
+ fmt.Fprintln(g.out, string(res.Config))
return nil
}
diff --git a/cmd/helm/inspect.go b/cmd/helm/inspect.go
index 9baa886166cc7e48b13810a2f554d3f480a18527..830e2948e0c3fb6e7b0fb905f7c36999493f9ceb 100644
--- a/cmd/helm/inspect.go
+++ b/cmd/helm/inspect.go
@@ -237,7 +237,7 @@ func (i *inspectCmd) run() error {
if i.output == all {
fmt.Fprintln(i.out, "---")
}
- fmt.Fprintln(i.out, chrt.Values.Raw)
+ fmt.Fprintln(i.out, string(chrt.Values))
}
if i.output == readmeOnly || i.output == all {
diff --git a/cmd/helm/package.go b/cmd/helm/package.go
index 537dfb31d3fbdfc01a0b220618d66d6f396457fe..6ffa90d08de0cfc7343ad16de578b36e4d9baaae 100644
--- a/cmd/helm/package.go
+++ b/cmd/helm/package.go
@@ -26,6 +26,7 @@ import (
"syscall"
"github.com/Masterminds/semver"
+ "github.com/ghodss/yaml"
"github.com/spf13/cobra"
"golang.org/x/crypto/ssh/terminal"
@@ -143,15 +144,15 @@ func (p *packageCmd) run() error {
if err != nil {
return err
}
- combinedVals, err := chartutil.CoalesceValues(ch, &chart.Config{Raw: string(overrideVals)})
+ combinedVals, err := chartutil.CoalesceValues(ch, overrideVals)
if err != nil {
return err
}
- newVals, err := combinedVals.YAML()
+ newVals, err := yaml.Marshal(combinedVals)
if err != nil {
return err
}
- ch.Values = &chart.Config{Raw: newVals}
+ ch.Values = newVals
// If version is set, modify the version.
if len(p.version) != 0 {
diff --git a/cmd/helm/package_test.go b/cmd/helm/package_test.go
index 1edc646f77e559ad687e0eb30331f77a469322b8..9328708364ac232278d149945a4b77b97b3d4e19 100644
--- a/cmd/helm/package_test.go
+++ b/cmd/helm/package_test.go
@@ -378,7 +378,7 @@ func getChartValues(chartPath string) (chartutil.Values, error) {
return nil, err
}
- return chartutil.ReadValues([]byte(chart.Values.Raw))
+ return chartutil.ReadValues(chart.Values)
}
func verifyValues(t *testing.T, actual, expected chartutil.Values) {
diff --git a/cmd/helm/printer.go b/cmd/helm/printer.go
index 57511b40689290766748db66f2f74d1bedf39b96..01210a89c1a4cad0f660359b2f341f18e3994f78 100644
--- a/cmd/helm/printer.go
+++ b/cmd/helm/printer.go
@@ -30,7 +30,7 @@ var printReleaseTemplate = `REVISION: {{.Release.Version}}
RELEASED: {{.ReleaseDate}}
CHART: {{.Release.Chart.Metadata.Name}}-{{.Release.Chart.Metadata.Version}}
USER-SUPPLIED VALUES:
-{{.Release.Config.Raw}}
+{{.Config}}
COMPUTED VALUES:
{{.ComputedValues}}
HOOKS:
@@ -59,6 +59,7 @@ func printRelease(out io.Writer, rel *release.Release) error {
data := map[string]interface{}{
"Release": rel,
+ "Config": string(rel.Config),
"ComputedValues": cfgStr,
"ReleaseDate": rel.Info.LastDeployed.Format(time.ANSIC),
}
diff --git a/cmd/helm/template.go b/cmd/helm/template.go
index 9b88c52bb4f4941dcbacf95917d8879dfc8d0863..85c415113d9d6a9c200e7fba13ffe3b8a0b9a710 100644
--- a/cmd/helm/template.go
+++ b/cmd/helm/template.go
@@ -32,7 +32,6 @@ import (
"k8s.io/helm/pkg/chartutil"
"k8s.io/helm/pkg/engine"
- "k8s.io/helm/pkg/hapi/chart"
"k8s.io/helm/pkg/hapi/release"
util "k8s.io/helm/pkg/releaseutil"
"k8s.io/helm/pkg/tiller"
@@ -150,11 +149,10 @@ func (t *templateCmd) run(cmd *cobra.Command, args []string) error {
t.namespace = defaultNamespace()
}
// get combined values and create config
- rawVals, err := vals(t.valueFiles, t.values, t.stringValues)
+ config, err := vals(t.valueFiles, t.values, t.stringValues)
if err != nil {
return err
}
- config := &chart.Config{Raw: string(rawVals), Values: map[string]*chart.Value{}}
// If template is specified, try to run the template.
if t.nameTemplate != "" {
diff --git a/pkg/chartutil/chartfile.go b/pkg/chartutil/chartfile.go
index 8632a2b3414a526b55a8e5d04d8fd7eae47a3daf..fcee815b6c3a02456239ea4e888b413ac6816a65 100644
--- a/pkg/chartutil/chartfile.go
+++ b/pkg/chartutil/chartfile.go
@@ -29,7 +29,7 @@ import (
)
// APIVersionv1 is the API version number for version 1.
-const APIVersionv1 = "v1" // nolint
+const APIVersionv1 = "v1"
// UnmarshalChartfile takes raw Chart.yaml data and unmarshals it.
func UnmarshalChartfile(data []byte) (*chart.Metadata, error) {
diff --git a/pkg/chartutil/create.go b/pkg/chartutil/create.go
index 3b2fe64ad2e22659ddddef0b3580fe4f9c6972e5..c6b148d4e162cbe63b2afe01b1fb60351b1e1ce2 100644
--- a/pkg/chartutil/create.go
+++ b/pkg/chartutil/create.go
@@ -307,7 +307,7 @@ func CreateFrom(chartfile *chart.Metadata, dest string, src string) error {
}
schart.Templates = updatedTemplates
- schart.Values = &chart.Config{Raw: string(Transform(schart.Values.Raw, "<CHARTNAME>", schart.Metadata.Name))}
+ schart.Values = Transform(string(schart.Values), "<CHARTNAME>", schart.Metadata.Name)
return SaveDir(schart, dest)
}
diff --git a/pkg/chartutil/create_test.go b/pkg/chartutil/create_test.go
index 6a2df46dc42f8bf5c1f7f7cc4ce2c72447f0dea9..01f5902a9161b29f25c22949a3b25d6f6ea5d901 100644
--- a/pkg/chartutil/create_test.go
+++ b/pkg/chartutil/create_test.go
@@ -128,7 +128,7 @@ func TestCreateFrom(t *testing.T) {
}
// Ensure we replace `<CHARTNAME>`
- if strings.Contains(mychart.Values.Raw, "<CHARTNAME>") {
- t.Errorf("Did not expect %s to be present in %s", "<CHARTNAME>", mychart.Values.Raw)
+ if strings.Contains(string(mychart.Values), "<CHARTNAME>") {
+ t.Errorf("Did not expect %s to be present in %s", "<CHARTNAME>", string(mychart.Values))
}
}
diff --git a/pkg/chartutil/load.go b/pkg/chartutil/load.go
index 28514cf1e31430dafa29307a3d7eba633ca18d0e..b3ea635105e7b3a1655be7bda106b469a58de778 100644
--- a/pkg/chartutil/load.go
+++ b/pkg/chartutil/load.go
@@ -132,7 +132,7 @@ func LoadFiles(files []*BufferedFile) (*chart.Chart, error) {
} else if f.Name == "values.toml" {
return c, errors.New("values.toml is illegal as of 2.0.0-alpha.2")
} else if f.Name == "values.yaml" {
- c.Values = &chart.Config{Raw: string(f.Data)}
+ c.Values = f.Data
} else if strings.HasPrefix(f.Name, "templates/") {
c.Templates = append(c.Templates, &chart.File{Name: f.Name, Data: f.Data})
} else if strings.HasPrefix(f.Name, "charts/") {
diff --git a/pkg/chartutil/load_test.go b/pkg/chartutil/load_test.go
index da689fa6fab88686dc19220b4f44015304b554d6..36dc371852060bb9baadc84457bdb146acd5713e 100644
--- a/pkg/chartutil/load_test.go
+++ b/pkg/chartutil/load_test.go
@@ -89,7 +89,7 @@ icon: https://example.com/64x64.png
t.Errorf("Expected chart name to be 'frobnitz', got %s", c.Metadata.Name)
}
- if c.Values.Raw != defaultValues {
+ if string(c.Values) != defaultValues {
t.Error("Expected chart values to be populated with default values")
}
diff --git a/pkg/chartutil/requirements.go b/pkg/chartutil/requirements.go
index 37743443e7da24fb682e93e0127e3caa089e63c8..e91eddfcaf2c80a1615500a537f3cf97c580a7c4 100644
--- a/pkg/chartutil/requirements.go
+++ b/pkg/chartutil/requirements.go
@@ -133,7 +133,7 @@ func ProcessRequirementsConditions(reqs *Requirements, cvals Values) {
}
for _, r := range reqs.Dependencies {
var hasTrue, hasFalse bool
- cond = string(r.Condition)
+ cond = r.Condition
// check for list
if len(cond) > 0 {
if strings.Contains(cond, ",") {
@@ -247,7 +247,7 @@ func getAliasDependency(charts []*chart.Chart, aliasChart *Dependency) *chart.Ch
}
// ProcessRequirementsEnabled removes disabled charts from dependencies
-func ProcessRequirementsEnabled(c *chart.Chart, v *chart.Config) error {
+func ProcessRequirementsEnabled(c *chart.Chart, v []byte) error {
reqs, err := LoadRequirements(c)
if err != nil {
// if not just missing requirements file, return error
@@ -297,11 +297,10 @@ func ProcessRequirementsEnabled(c *chart.Chart, v *chart.Config) error {
return err
}
// convert our values back into config
- yvals, err := cvals.YAML()
+ yvals, err := yaml.Marshal(cvals)
if err != nil {
return err
}
- cc := chart.Config{Raw: yvals}
// flag dependencies as enabled/disabled
ProcessRequirementsTags(reqs, cvals)
ProcessRequirementsConditions(reqs, cvals)
@@ -324,7 +323,7 @@ func ProcessRequirementsEnabled(c *chart.Chart, v *chart.Config) error {
}
// recursively call self to process sub dependencies
for _, t := range cd {
- err := ProcessRequirementsEnabled(t, &cc)
+ err := ProcessRequirementsEnabled(t, yvals)
// if its not just missing requirements file, return error
if nerr, ok := err.(ErrNoRequirementsFile); !ok && err != nil {
return nerr
@@ -388,7 +387,7 @@ func processImportValues(c *chart.Chart) error {
return err
}
// combine chart values and empty config to get Values
- cvals, err := CoalesceValues(c, &chart.Config{})
+ cvals, err := CoalesceValues(c, []byte{})
if err != nil {
return err
}
@@ -441,7 +440,7 @@ func processImportValues(c *chart.Chart) error {
}
// set the new values
- c.Values = &chart.Config{Raw: string(y)}
+ c.Values = y
return nil
}
diff --git a/pkg/chartutil/requirements_test.go b/pkg/chartutil/requirements_test.go
index 11ff3fb4c7834622300c8037e713c52bd0187659..84950c0cd2cbdb9c99e85d1e6a7fd14513c7c1f3 100644
--- a/pkg/chartutil/requirements_test.go
+++ b/pkg/chartutil/requirements_test.go
@@ -45,7 +45,7 @@ func TestRequirementsTagsNonValue(t *testing.T) {
t.Fatalf("Failed to load testdata: %s", err)
}
// tags with no effect
- v := &chart.Config{Raw: "tags:\n nothinguseful: false\n\n"}
+ v := []byte("tags:\n nothinguseful: false\n\n")
// expected charts including duplicates in alphanumeric order
e := []string{"parentchart", "subchart1", "subcharta", "subchartb"}
@@ -57,7 +57,7 @@ func TestRequirementsTagsDisabledL1(t *testing.T) {
t.Fatalf("Failed to load testdata: %s", err)
}
// tags disabling a group
- v := &chart.Config{Raw: "tags:\n front-end: false\n\n"}
+ v := []byte("tags:\n front-end: false\n\n")
// expected charts including duplicates in alphanumeric order
e := []string{"parentchart"}
@@ -69,7 +69,7 @@ func TestRequirementsTagsEnabledL1(t *testing.T) {
t.Fatalf("Failed to load testdata: %s", err)
}
// tags disabling a group and enabling a different group
- v := &chart.Config{Raw: "tags:\n front-end: false\n\n back-end: true\n"}
+ v := []byte("tags:\n front-end: false\n\n back-end: true\n")
// expected charts including duplicates in alphanumeric order
e := []string{"parentchart", "subchart2", "subchartb", "subchartc"}
@@ -82,7 +82,7 @@ func TestRequirementsTagsDisabledL2(t *testing.T) {
t.Fatalf("Failed to load testdata: %s", err)
}
// tags disabling only children, children still enabled since tag front-end=true in values.yaml
- v := &chart.Config{Raw: "tags:\n subcharta: false\n\n subchartb: false\n"}
+ v := []byte("tags:\n subcharta: false\n\n subchartb: false\n")
// expected charts including duplicates in alphanumeric order
e := []string{"parentchart", "subchart1", "subcharta", "subchartb"}
@@ -94,7 +94,7 @@ func TestRequirementsTagsDisabledL1Mixed(t *testing.T) {
t.Fatalf("Failed to load testdata: %s", err)
}
// tags disabling all parents/children with additional tag re-enabling a parent
- v := &chart.Config{Raw: "tags:\n front-end: false\n\n subchart1: true\n\n back-end: false\n"}
+ v := []byte("tags:\n front-end: false\n\n subchart1: true\n\n back-end: false\n")
// expected charts including duplicates in alphanumeric order
e := []string{"parentchart", "subchart1"}
@@ -106,7 +106,7 @@ func TestRequirementsConditionsNonValue(t *testing.T) {
t.Fatalf("Failed to load testdata: %s", err)
}
// tags with no effect
- v := &chart.Config{Raw: "subchart1:\n nothinguseful: false\n\n"}
+ v := []byte("subchart1:\n nothinguseful: false\n\n")
// expected charts including duplicates in alphanumeric order
e := []string{"parentchart", "subchart1", "subcharta", "subchartb"}
@@ -118,7 +118,7 @@ func TestRequirementsConditionsEnabledL1Both(t *testing.T) {
t.Fatalf("Failed to load testdata: %s", err)
}
// conditions enabling the parent charts, but back-end (b, c) is still disabled via values.yaml
- v := &chart.Config{Raw: "subchart1:\n enabled: true\nsubchart2:\n enabled: true\n"}
+ v := []byte("subchart1:\n enabled: true\nsubchart2:\n enabled: true\n")
// expected charts including duplicates in alphanumeric order
e := []string{"parentchart", "subchart1", "subchart2", "subcharta", "subchartb"}
@@ -130,7 +130,7 @@ func TestRequirementsConditionsDisabledL1Both(t *testing.T) {
t.Fatalf("Failed to load testdata: %s", err)
}
// conditions disabling the parent charts, effectively disabling children
- v := &chart.Config{Raw: "subchart1:\n enabled: false\nsubchart2:\n enabled: false\n"}
+ v := []byte("subchart1:\n enabled: false\nsubchart2:\n enabled: false\n")
// expected charts including duplicates in alphanumeric order
e := []string{"parentchart"}
@@ -143,7 +143,7 @@ func TestRequirementsConditionsSecond(t *testing.T) {
t.Fatalf("Failed to load testdata: %s", err)
}
// conditions a child using the second condition path of child's condition
- v := &chart.Config{Raw: "subchart1:\n subcharta:\n enabled: false\n"}
+ v := []byte("subchart1:\n subcharta:\n enabled: false\n")
// expected charts including duplicates in alphanumeric order
e := []string{"parentchart", "subchart1", "subchartb"}
@@ -155,7 +155,7 @@ func TestRequirementsCombinedDisabledL2(t *testing.T) {
t.Fatalf("Failed to load testdata: %s", err)
}
// tags enabling a parent/child group with condition disabling one child
- v := &chart.Config{Raw: "subchartc:\n enabled: false\ntags:\n back-end: true\n"}
+ v := []byte("subchartc:\n enabled: false\ntags:\n back-end: true\n")
// expected charts including duplicates in alphanumeric order
e := []string{"parentchart", "subchart1", "subchart2", "subcharta", "subchartb", "subchartb"}
@@ -167,14 +167,14 @@ func TestRequirementsCombinedDisabledL1(t *testing.T) {
t.Fatalf("Failed to load testdata: %s", err)
}
// tags will not enable a child if parent is explicitly disabled with condition
- v := &chart.Config{Raw: "subchart1:\n enabled: false\ntags:\n front-end: true\n"}
+ v := []byte("subchart1:\n enabled: false\ntags:\n front-end: true\n")
// expected charts including duplicates in alphanumeric order
e := []string{"parentchart"}
verifyRequirementsEnabled(t, c, v, e)
}
-func verifyRequirementsEnabled(t *testing.T, c *chart.Chart, v *chart.Config, e []string) {
+func verifyRequirementsEnabled(t *testing.T, c *chart.Chart, v []byte, e []string) {
out := []*chart.Chart{}
err := ProcessRequirementsEnabled(c, v)
if err != nil {
@@ -216,7 +216,7 @@ func TestProcessRequirementsImportValues(t *testing.T) {
t.Fatalf("Failed to load testdata: %s", err)
}
- v := &chart.Config{Raw: ""}
+ v := []byte{}
e := make(map[string]string)
@@ -281,14 +281,13 @@ func TestProcessRequirementsImportValues(t *testing.T) {
verifyRequirementsImportValues(t, c, v, e)
}
-func verifyRequirementsImportValues(t *testing.T, c *chart.Chart, v *chart.Config, e map[string]string) {
+func verifyRequirementsImportValues(t *testing.T, c *chart.Chart, v []byte, e map[string]string) {
err := ProcessRequirementsImportValues(c)
if err != nil {
t.Errorf("Error processing import values requirements %v", err)
}
- cv := c.Values
- cc, err := ReadValues([]byte(cv.Raw))
+ cc, err := ReadValues(c.Values)
if err != nil {
t.Errorf("Error reading import values %v", err)
}
diff --git a/pkg/chartutil/save.go b/pkg/chartutil/save.go
index 3316c85a6ee265707f1373ccc15259dd71f65804..d4884fff6a06b6a92587fe312942278ae46b0b63 100644
--- a/pkg/chartutil/save.go
+++ b/pkg/chartutil/save.go
@@ -46,9 +46,9 @@ func SaveDir(c *chart.Chart, dest string) error {
}
// Save values.yaml
- if c.Values != nil && len(c.Values.Raw) > 0 {
+ if len(c.Values) > 0 {
vf := filepath.Join(outdir, ValuesfileName)
- if err := ioutil.WriteFile(vf, []byte(c.Values.Raw), 0755); err != nil {
+ if err := ioutil.WriteFile(vf, c.Values, 0755); err != nil {
return err
}
}
@@ -170,8 +170,8 @@ func writeTarContents(out *tar.Writer, c *chart.Chart, prefix string) error {
}
// Save values.yaml
- if c.Values != nil && len(c.Values.Raw) > 0 {
- if err := writeToTar(out, base+"/values.yaml", []byte(c.Values.Raw)); err != nil {
+ if len(c.Values) > 0 {
+ if err := writeToTar(out, base+"/values.yaml", c.Values); err != nil {
return err
}
}
diff --git a/pkg/chartutil/save_test.go b/pkg/chartutil/save_test.go
index 153452fcad6f791955dd6e9ca56d841718fb3a06..04db9cf8025e0decb7b85dfeb6bd53fd51ec960c 100644
--- a/pkg/chartutil/save_test.go
+++ b/pkg/chartutil/save_test.go
@@ -17,6 +17,7 @@ limitations under the License.
package chartutil
import (
+ "bytes"
"io/ioutil"
"os"
"strings"
@@ -37,9 +38,7 @@ func TestSave(t *testing.T) {
Name: "ahab",
Version: "1.2.3.4",
},
- Values: &chart.Config{
- Raw: "ship: Pequod",
- },
+ Values: []byte("ship: Pequod"),
Files: []*chart.File{
{Name: "scheherazade/shahryar.txt", Data: []byte("1,001 Nights")},
},
@@ -64,7 +63,7 @@ func TestSave(t *testing.T) {
if c2.Metadata.Name != c.Metadata.Name {
t.Fatalf("Expected chart archive to have %q, got %q", c.Metadata.Name, c2.Metadata.Name)
}
- if c2.Values.Raw != c.Values.Raw {
+ if !bytes.Equal(c2.Values, c.Values) {
t.Fatal("Values data did not match")
}
if len(c2.Files) != 1 || c2.Files[0].Name != "scheherazade/shahryar.txt" {
@@ -84,9 +83,7 @@ func TestSaveDir(t *testing.T) {
Name: "ahab",
Version: "1.2.3.4",
},
- Values: &chart.Config{
- Raw: "ship: Pequod",
- },
+ Values: []byte("ship: Pequod"),
Files: []*chart.File{
{Name: "scheherazade/shahryar.txt", Data: []byte("1,001 Nights")},
},
@@ -104,7 +101,7 @@ func TestSaveDir(t *testing.T) {
if c2.Metadata.Name != c.Metadata.Name {
t.Fatalf("Expected chart archive to have %q, got %q", c.Metadata.Name, c2.Metadata.Name)
}
- if c2.Values.Raw != c.Values.Raw {
+ if !bytes.Equal(c2.Values, c.Values) {
t.Fatal("Values data did not match")
}
if len(c2.Files) != 1 || c2.Files[0].Name != "scheherazade/shahryar.txt" {
diff --git a/pkg/chartutil/values.go b/pkg/chartutil/values.go
index 7f131c1b3369750f72180c11b4abd490cb837396..49a849c0e358e2ab76dc2a9d151c656e929fb3e1 100644
--- a/pkg/chartutil/values.go
+++ b/pkg/chartutil/values.go
@@ -142,12 +142,12 @@ func ReadValuesFile(filename string) (Values, error) {
// - Scalar values and arrays are replaced, maps are merged
// - A chart has access to all of the variables for it, as well as all of
// the values destined for its dependencies.
-func CoalesceValues(chrt *chart.Chart, vals *chart.Config) (Values, error) {
+func CoalesceValues(chrt *chart.Chart, vals []byte) (Values, error) {
cvals := Values{}
// Parse values if not nil. We merge these at the top level because
// the passed-in values are in the same namespace as the parent chart.
if vals != nil {
- evals, err := ReadValues([]byte(vals.Raw))
+ evals, err := ReadValues(vals)
if err != nil {
return cvals, err
}
@@ -267,16 +267,16 @@ func copyMap(src map[string]interface{}) map[string]interface{} {
// Values in v will override the values in the chart.
func coalesceValues(c *chart.Chart, v map[string]interface{}) (map[string]interface{}, error) {
// If there are no values in the chart, we just return the given values
- if c.Values == nil || c.Values.Raw == "" {
+ if len(c.Values) == 0 {
return v, nil
}
- nv, err := ReadValues([]byte(c.Values.Raw))
+ nv, err := ReadValues(c.Values)
if err != nil {
// On error, we return just the overridden values.
// FIXME: We should log this error. It indicates that the YAML data
// did not parse.
- return v, fmt.Errorf("error reading default values (%s): %s", c.Values.Raw, err)
+ return v, fmt.Errorf("error reading default values (%s): %s", c.Values, err)
}
for key, val := range nv {
@@ -349,7 +349,7 @@ type ReleaseOptions struct {
// remain in the codebase to stay SemVer compliant.
//
// In Helm 3.0, this will be changed to accept Capabilities as a fourth parameter.
-func ToRenderValues(chrt *chart.Chart, chrtVals *chart.Config, options ReleaseOptions) (Values, error) {
+func ToRenderValues(chrt *chart.Chart, chrtVals []byte, options ReleaseOptions) (Values, error) {
caps := &Capabilities{APIVersions: DefaultVersionSet}
return ToRenderValuesCaps(chrt, chrtVals, options, caps)
}
@@ -357,7 +357,7 @@ func ToRenderValues(chrt *chart.Chart, chrtVals *chart.Config, options ReleaseOp
// ToRenderValuesCaps composes the struct from the data coming from the Releases, Charts and Values files
//
// This takes both ReleaseOptions and Capabilities to merge into the render values.
-func ToRenderValuesCaps(chrt *chart.Chart, chrtVals *chart.Config, options ReleaseOptions, caps *Capabilities) (Values, error) {
+func ToRenderValuesCaps(chrt *chart.Chart, chrtVals []byte, options ReleaseOptions, caps *Capabilities) (Values, error) {
top := map[string]interface{}{
"Release": map[string]interface{}{
diff --git a/pkg/chartutil/values_test.go b/pkg/chartutil/values_test.go
index b5e77bbd7ad05769755d2235ed09123e4ab160a4..992bb48ae6e6d3e075e943e8f6ed7b2007a1d581 100644
--- a/pkg/chartutil/values_test.go
+++ b/pkg/chartutil/values_test.go
@@ -89,18 +89,18 @@ where:
c := &chart.Chart{
Metadata: &chart.Metadata{Name: "test"},
Templates: []*chart.File{},
- Values: &chart.Config{Raw: chartValues},
+ Values: []byte(chartValues),
Dependencies: []*chart.Chart{
{
Metadata: &chart.Metadata{Name: "where"},
- Values: &chart.Config{Raw: ""},
+ Values: []byte{},
},
},
Files: []*chart.File{
{Name: "scheherazade/shahryar.txt", Data: []byte("1,001 Nights")},
},
}
- v := &chart.Config{Raw: overideValues}
+ v := []byte(overideValues)
o := ReleaseOptions{
Name: "Seven Voyages",
@@ -305,9 +305,7 @@ func TestCoalesceValues(t *testing.T) {
t.Fatal(err)
}
- tvals := &chart.Config{Raw: testCoalesceValuesYaml}
-
- v, err := CoalesceValues(c, tvals)
+ v, err := CoalesceValues(c, []byte(testCoalesceValuesYaml))
if err != nil {
t.Fatal(err)
}
diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go
index 956357cde297e39057d83194779d10461650c380..be9aaa448ffb7318c2a5b72f8fbe5ddb4f7b89d7 100644
--- a/pkg/engine/engine_test.go
+++ b/pkg/engine/engine_test.go
@@ -97,18 +97,15 @@ func TestRender(t *testing.T) {
{Name: "templates/test2", Data: []byte("{{.global.callme | lower }}")},
{Name: "templates/test3", Data: []byte("{{.noValue}}")},
},
- Values: &chart.Config{
- Raw: "outer: DEFAULT\ninner: DEFAULT",
- },
+ Values: []byte("outer: DEFAULT\ninner: DEFAULT"),
}
- vals := &chart.Config{
- Raw: `
+ vals := []byte(`
outer: spouter
inner: inn
global:
callme: Ishmael
-`}
+`)
e := New()
v, err := chartutil.CoalesceValues(c, vals)
@@ -280,7 +277,7 @@ func TestRenderNestedValues(t *testing.T) {
{Name: deepestpath, Data: []byte(`And this same {{.Values.what}} that smiles {{.Values.global.when}}`)},
{Name: checkrelease, Data: []byte(`Tomorrow will be {{default "happy" .Release.Name }}`)},
},
- Values: &chart.Config{Raw: `what: "milkshake"`},
+ Values: []byte(`what: "milkshake"`),
}
inner := &chart.Chart{
@@ -288,7 +285,7 @@ func TestRenderNestedValues(t *testing.T) {
Templates: []*chart.File{
{Name: innerpath, Data: []byte(`Old {{.Values.who}} is still a-flyin'`)},
},
- Values: &chart.Config{Raw: `who: "Robert"`},
+ Values: []byte(`who: "Robert"`),
Dependencies: []*chart.Chart{deepest},
}
@@ -297,27 +294,23 @@ func TestRenderNestedValues(t *testing.T) {
Templates: []*chart.File{
{Name: outerpath, Data: []byte(`Gather ye {{.Values.what}} while ye may`)},
},
- Values: &chart.Config{
- Raw: `
+ Values: []byte(`
what: stinkweed
who: me
herrick:
- who: time`,
- },
+ who: time`),
Dependencies: []*chart.Chart{inner},
}
- injValues := chart.Config{
- Raw: `
+ injValues := []byte(`
what: rosebuds
herrick:
deepest:
what: flower
global:
- when: to-day`,
- }
+ when: to-day`)
- tmp, err := chartutil.CoalesceValues(outer, &injValues)
+ tmp, err := chartutil.CoalesceValues(outer, injValues)
if err != nil {
t.Fatalf("Failed to coalesce values: %s", err)
}
@@ -365,7 +358,7 @@ func TestRenderBuiltinValues(t *testing.T) {
{Name: "templates/Lavinia", Data: []byte(`{{.Template.Name}}{{.Chart.Name}}{{.Release.Name}}`)},
{Name: "templates/From", Data: []byte(`{{.Files.author | printf "%s"}} {{.Files.Get "book/title.txt"}}`)},
},
- Values: &chart.Config{Raw: ``},
+ Values: []byte{},
Dependencies: []*chart.Chart{},
Files: []*chart.File{
{Name: "author", Data: []byte("Virgil")},
@@ -378,12 +371,12 @@ func TestRenderBuiltinValues(t *testing.T) {
Templates: []*chart.File{
{Name: "templates/Aeneas", Data: []byte(`{{.Template.Name}}{{.Chart.Name}}{{.Release.Name}}`)},
},
- Values: &chart.Config{Raw: ``},
+ Values: []byte{},
Dependencies: []*chart.Chart{inner},
}
inject := chartutil.Values{
- "Values": &chart.Config{Raw: ""},
+ "Values": "",
"Chart": outer.Metadata,
"Release": chartutil.Values{
"Name": "Aeneid",
@@ -417,12 +410,12 @@ func TestAlterFuncMap(t *testing.T) {
{Name: "templates/quote", Data: []byte(`{{include "conrad/templates/_partial" . | indent 2}} dead.`)},
{Name: "templates/_partial", Data: []byte(`{{.Release.Name}} - he`)},
},
- Values: &chart.Config{Raw: ``},
+ Values: []byte{},
Dependencies: []*chart.Chart{},
}
v := chartutil.Values{
- "Values": &chart.Config{Raw: ""},
+ "Values": "",
"Chart": c.Metadata,
"Release": chartutil.Values{
"Name": "Mistah Kurtz",
@@ -445,7 +438,7 @@ func TestAlterFuncMap(t *testing.T) {
{Name: "templates/quote", Data: []byte(`All your base are belong to {{ required "A valid 'who' is required" .Values.who }}`)},
{Name: "templates/bases", Data: []byte(`All {{ required "A valid 'bases' is required" .Values.bases }} of them!`)},
},
- Values: &chart.Config{Raw: ``},
+ Values: []byte{},
Dependencies: []*chart.Chart{},
}
@@ -479,7 +472,7 @@ func TestAlterFuncMap(t *testing.T) {
Templates: []*chart.File{
{Name: "templates/base", Data: []byte(`Evaluate tpl {{tpl "Value: {{ .Values.value}}" .}}`)},
},
- Values: &chart.Config{Raw: ``},
+ Values: []byte{},
Dependencies: []*chart.Chart{},
}
@@ -508,7 +501,7 @@ func TestAlterFuncMap(t *testing.T) {
Templates: []*chart.File{
{Name: "templates/base", Data: []byte(`Evaluate tpl {{tpl "Value: {{ .Values.value | quote}}" .}}`)},
},
- Values: &chart.Config{Raw: ``},
+ Values: []byte{},
Dependencies: []*chart.Chart{},
}
@@ -538,7 +531,7 @@ func TestAlterFuncMap(t *testing.T) {
{Name: "templates/base", Data: []byte(`{{ tpl "{{include ` + "`" + `TplFunction/templates/_partial` + "`" + ` . | quote }}" .}}`)},
{Name: "templates/_partial", Data: []byte(`{{.Template.Name}}`)},
},
- Values: &chart.Config{Raw: ``},
+ Values: []byte{},
Dependencies: []*chart.Chart{},
}
tplValueWithInclude := chartutil.Values{
diff --git a/pkg/hapi/chart/chart.go b/pkg/hapi/chart/chart.go
index 9fac5644173f4caf2d21e0b33ade3e3a38221114..cb87ac4676ae85d7a2936858550fc98c5cc118f0 100644
--- a/pkg/hapi/chart/chart.go
+++ b/pkg/hapi/chart/chart.go
@@ -10,7 +10,7 @@ type Chart struct {
// Charts that this chart depends on.
Dependencies []*Chart `json:"dependencies,omitempty"`
// Default config for this template.
- Values *Config `json:"values,omitempty"`
+ Values []byte `json:"values,omitempty"`
// Miscellaneous files in a chart archive,
// e.g. README, LICENSE, etc.
Files []*File `json:"files,omitempty"`
diff --git a/pkg/hapi/chart/config.go b/pkg/hapi/chart/config.go
deleted file mode 100644
index ccca839273ae4b9e698c60827249adb0730a3fc9..0000000000000000000000000000000000000000
--- a/pkg/hapi/chart/config.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package chart
-
-// Config supplies values to the parametrizable templates of a chart.
-type Config struct {
- Raw string `json:"raw,omitempty"`
- Values map[string]*Value `json:"values,omitempty"`
-}
-
-// Value describes a configuration value as a string.
-type Value struct {
- Value string `json:"value,omitempty"`
-}
diff --git a/pkg/hapi/release/release.go b/pkg/hapi/release/release.go
index 39edc03b4cc1c43b51c9cff62bc0301cecc029b1..2b10235fd00f61536d2481960ab14c1e597b63c2 100644
--- a/pkg/hapi/release/release.go
+++ b/pkg/hapi/release/release.go
@@ -13,7 +13,7 @@ type Release struct {
Chart *chart.Chart `json:"chart,omitempty"`
// Config is the set of extra Values added to the chart.
// These values override the default values inside of the chart.
- Config *chart.Config `json:"config,omitempty"`
+ Config []byte `json:"config,omitempty"`
// Manifest is the string representation of the rendered template.
Manifest string `json:"manifest,omitempty"`
// Hooks are all of the hooks declared for this release.
diff --git a/pkg/hapi/tiller.go b/pkg/hapi/tiller.go
index 82091bfb7c7e02149c5300890b4e48f7bea15bd8..0b66975b3a29250710f8c5e240c56b7461eaa2b2 100644
--- a/pkg/hapi/tiller.go
+++ b/pkg/hapi/tiller.go
@@ -110,7 +110,7 @@ type UpdateReleaseRequest struct {
// Chart is the protobuf representation of a chart.
Chart *chart.Chart `json:"chart,omityempty"`
// Values is a string containing (unparsed) YAML values.
- Values *chart.Config `json:"values,omityempty"`
+ Values []byte `json:"values,omityempty"`
// dry_run, if true, will run through the release logic, but neither create
DryRun bool `json:"dry_run,omityempty"`
// DisableHooks causes the server to skip running any hooks for the upgrade.
@@ -156,7 +156,7 @@ type InstallReleaseRequest struct {
// Chart is the protobuf representation of a chart.
Chart *chart.Chart `json:"chart,omityempty"`
// Values is a string containing (unparsed) YAML values.
- Values *chart.Config `json:"values,omityempty"`
+ Values []byte `json:"values,omityempty"`
// DryRun, if true, will run through the release logic, but neither create
// a release object nor deploy to Kubernetes. The release object returned
// in the response will be fake.
diff --git a/pkg/helm/fake.go b/pkg/helm/fake.go
index 509dd376141c32c2596ed3636d2d09635fc8c0a4..0a971cd6a58c6386b99f5b8741421a825f875522 100644
--- a/pkg/helm/fake.go
+++ b/pkg/helm/fake.go
@@ -231,7 +231,7 @@ func ReleaseMock(opts *MockReleaseOptions) *release.Release {
Description: "Release mock",
},
Chart: ch,
- Config: &chart.Config{Raw: `name: "value"`},
+ Config: []byte(`name: "value"`),
Version: version,
Namespace: namespace,
Hooks: []*release.Hook{
diff --git a/pkg/helm/helm_test.go b/pkg/helm/helm_test.go
index dacb9ec3038a63db658e8db59f45687c78b57e48..d94d0744e43f8f48716372a2ab7eae35d023f135 100644
--- a/pkg/helm/helm_test.go
+++ b/pkg/helm/helm_test.go
@@ -109,7 +109,7 @@ func TestInstallRelease_VerifyOptions(t *testing.T) {
// Expected InstallReleaseRequest message
exp := &hapi.InstallReleaseRequest{
Chart: loadChart(t, chartName),
- Values: &cpb.Config{Raw: string(overrides)},
+ Values: overrides,
DryRun: dryRun,
Name: releaseName,
DisableHooks: disableHooks,
@@ -202,7 +202,7 @@ func TestUpdateRelease_VerifyOptions(t *testing.T) {
exp := &hapi.UpdateReleaseRequest{
Name: releaseName,
Chart: loadChart(t, chartName),
- Values: &cpb.Config{Raw: string(overrides)},
+ Values: overrides,
DryRun: dryRun,
DisableHooks: disableHooks,
}
diff --git a/pkg/helm/option.go b/pkg/helm/option.go
index 6c1df5893bb695b53e1d0f3fa38c8a0391690557..0a476a5ea297524c93883dc1e89534af857f4149 100644
--- a/pkg/helm/option.go
+++ b/pkg/helm/option.go
@@ -20,7 +20,6 @@ import (
"k8s.io/client-go/discovery"
"k8s.io/helm/pkg/hapi"
- cpb "k8s.io/helm/pkg/hapi/chart"
"k8s.io/helm/pkg/hapi/release"
"k8s.io/helm/pkg/storage/driver"
"k8s.io/helm/pkg/tiller/environment"
@@ -154,7 +153,7 @@ type InstallOption func(*options)
// ValueOverrides specifies a list of values to include when installing.
func ValueOverrides(raw []byte) InstallOption {
return func(opts *options) {
- opts.instReq.Values = &cpb.Config{Raw: string(raw)}
+ opts.instReq.Values = raw
}
}
@@ -231,7 +230,7 @@ func RollbackWait(wait bool) RollbackOption {
// UpdateValueOverrides specifies a list of values to include when upgrading
func UpdateValueOverrides(raw []byte) UpdateOption {
return func(opts *options) {
- opts.updateReq.Values = &cpb.Config{Raw: string(raw)}
+ opts.updateReq.Values = raw
}
}
diff --git a/pkg/lint/rules/chartfile_test.go b/pkg/lint/rules/chartfile_test.go
index 83ddd4a30912b629903344c4db440daf6a591c8c..acc506eb7381ad8189b925fa0e3a654012267966 100644
--- a/pkg/lint/rules/chartfile_test.go
+++ b/pkg/lint/rules/chartfile_test.go
@@ -39,7 +39,7 @@ var (
nonExistingChartFilePath = filepath.Join(os.TempDir(), "Chart.yaml")
)
-var badChart, chatLoadRrr = chartutil.LoadChartfile(badChartFilePath)
+var badChart, _ = chartutil.LoadChartfile(badChartFilePath)
var goodChart, _ = chartutil.LoadChartfile(goodChartFilePath)
// Validation functions Test
diff --git a/pkg/lint/rules/template.go b/pkg/lint/rules/template.go
index c42d7f2a9b0d68d81e3b7c40cf78ffb28ff667ba..3478912676bb1469a981fe105503fe4cd917b9e2 100644
--- a/pkg/lint/rules/template.go
+++ b/pkg/lint/rules/template.go
@@ -27,7 +27,6 @@ import (
"k8s.io/helm/pkg/chartutil"
"k8s.io/helm/pkg/engine"
- cpb "k8s.io/helm/pkg/hapi/chart"
"k8s.io/helm/pkg/lint/support"
tversion "k8s.io/helm/pkg/version"
)
@@ -59,17 +58,16 @@ func Templates(linter *support.Linter, values []byte, namespace string, strict b
KubeVersion: chartutil.DefaultKubeVersion,
TillerVersion: tversion.GetVersionProto(),
}
- cvals, err := chartutil.CoalesceValues(chart, &cpb.Config{Raw: string(values)})
+ cvals, err := chartutil.CoalesceValues(chart, values)
if err != nil {
return
}
// convert our values back into config
- yvals, err := cvals.YAML()
+ yvals, err := yaml.Marshal(cvals)
if err != nil {
return
}
- cc := &cpb.Config{Raw: yvals}
- valuesToRender, err := chartutil.ToRenderValuesCaps(chart, cc, options, caps)
+ valuesToRender, err := chartutil.ToRenderValuesCaps(chart, yvals, options, caps)
if err != nil {
// FIXME: This seems to generate a duplicate, but I can't find where the first
// error is coming from.
diff --git a/pkg/lint/rules/values.go b/pkg/lint/rules/values.go
index 9b97598f0f83e71a2eca821d03da8db02d0f62a8..20ed411156a86ecdc2fb8bac603163ad6263b88b 100644
--- a/pkg/lint/rules/values.go
+++ b/pkg/lint/rules/values.go
@@ -29,16 +29,16 @@ import (
func Values(linter *support.Linter) {
file := "values.yaml"
vf := filepath.Join(linter.ChartDir, file)
- fileExists := linter.RunLinterRule(support.InfoSev, file, validateValuesFileExistence(linter, vf))
+ fileExists := linter.RunLinterRule(support.InfoSev, file, validateValuesFileExistence(vf))
if !fileExists {
return
}
- linter.RunLinterRule(support.ErrorSev, file, validateValuesFile(linter, vf))
+ linter.RunLinterRule(support.ErrorSev, file, validateValuesFile(vf))
}
-func validateValuesFileExistence(linter *support.Linter, valuesPath string) error {
+func validateValuesFileExistence(valuesPath string) error {
_, err := os.Stat(valuesPath)
if err != nil {
return fmt.Errorf("file does not exist")
@@ -46,7 +46,7 @@ func validateValuesFileExistence(linter *support.Linter, valuesPath string) erro
return nil
}
-func validateValuesFile(linter *support.Linter, valuesPath string) error {
+func validateValuesFile(valuesPath string) error {
_, err := chartutil.ReadValuesFile(valuesPath)
if err != nil {
return fmt.Errorf("unable to parse YAML\n\t%s", err)
diff --git a/pkg/tiller/release_server.go b/pkg/tiller/release_server.go
index 2e5937c055913a2abc3b30d9035a528c798e0476..46db4eef280331812162bc1f08d1079a43037a9e 100644
--- a/pkg/tiller/release_server.go
+++ b/pkg/tiller/release_server.go
@@ -122,18 +122,19 @@ func (s *ReleaseServer) reuseValues(req *hapi.UpdateReleaseRequest, current *rel
s.Log("%s", err)
return err
}
- nv, err := oldVals.YAML()
+ nv, err := yaml.Marshal(oldVals)
if err != nil {
return err
}
// merge new values with current
- req.Values.Raw = current.Config.Raw + "\n" + req.Values.Raw
- req.Chart.Values = &chart.Config{Raw: nv}
+ b := append(current.Config, '\n')
+ req.Values = append(b, req.Values...)
+ req.Chart.Values = nv
// yaml unmarshal and marshal to remove duplicate keys
y := map[string]interface{}{}
- if err := yaml.Unmarshal([]byte(req.Values.Raw), &y); err != nil {
+ if err := yaml.Unmarshal(req.Values, &y); err != nil {
return err
}
data, err := yaml.Marshal(y)
@@ -141,16 +142,15 @@ func (s *ReleaseServer) reuseValues(req *hapi.UpdateReleaseRequest, current *rel
return err
}
- req.Values.Raw = string(data)
+ req.Values = data
return nil
}
// If req.Values is empty, but current.Config is not, copy current into the
// request.
- if (req.Values == nil || req.Values.Raw == "" || req.Values.Raw == "{}\n") &&
- current.Config != nil &&
- current.Config.Raw != "" &&
- current.Config.Raw != "{}\n" {
+ if (len(req.Values) == 0 || bytes.Equal(req.Values, []byte("{}\n"))) &&
+ len(current.Config) > 0 &&
+ !bytes.Equal(current.Config, []byte("{}\n")) {
s.Log("copying values from %s (v%d) to new release.", current.Name, current.Version)
req.Values = current.Config
}
diff --git a/pkg/tiller/release_server_test.go b/pkg/tiller/release_server_test.go
index 5f65412f762f98691ecd02867e09d4e13c221007..9d1d704090a2615655026d5cebe2a030d0a5b09c 100644
--- a/pkg/tiller/release_server_test.go
+++ b/pkg/tiller/release_server_test.go
@@ -229,7 +229,7 @@ func namedReleaseStub(name string, status release.StatusCode) *release.Release {
Description: "Named Release Stub",
},
Chart: chartStub(),
- Config: &chart.Config{Raw: `name: value`},
+ Config: []byte(`name: value`),
Version: 1,
Hooks: []*release.Hook{
{
@@ -369,7 +369,7 @@ func releaseWithKeepStub(rlsName string) *release.Release {
Status: &release.Status{Code: release.Status_DEPLOYED},
},
Chart: ch,
- Config: &chart.Config{Raw: `name: value`},
+ Config: []byte(`name: value`),
Version: 1,
Manifest: manifestWithKeep,
}
diff --git a/pkg/tiller/release_update_test.go b/pkg/tiller/release_update_test.go
index 30f01320421c09b6289381bad799cc7f3abb28d2..7e1f5e4c4d8f07859c8526f1e0a6336acb7c8232 100644
--- a/pkg/tiller/release_update_test.go
+++ b/pkg/tiller/release_update_test.go
@@ -17,7 +17,7 @@ limitations under the License.
package tiller
import (
- "fmt"
+ "bytes"
"reflect"
"strings"
"testing"
@@ -82,8 +82,8 @@ func TestUpdateRelease(t *testing.T) {
if res.Config == nil {
t.Errorf("Got release without config: %#v", res)
- } else if res.Config.Raw != rel.Config.Raw {
- t.Errorf("Expected release values %q, got %q", rel.Config.Raw, res.Config.Raw)
+ } else if !bytes.Equal(res.Config, rel.Config) {
+ t.Errorf("Expected release values %q, got %q", rel.Config, res.Config)
}
if !strings.Contains(updated.Manifest, "---\n# Source: hello/templates/hello\nhello: world") {
@@ -120,8 +120,8 @@ func TestUpdateRelease_ResetValues(t *testing.T) {
t.Fatalf("Failed updated: %s", err)
}
// This should have been unset. Config: &chart.Config{Raw: `name: value`},
- if res.Config != nil && res.Config.Raw != "" {
- t.Errorf("Expected chart config to be empty, got %q", res.Config.Raw)
+ if len(res.Config) > 0 {
+ t.Errorf("Expected chart config to be empty, got %q", res.Config)
}
}
@@ -137,18 +137,17 @@ func TestUpdateRelease_ComplexReuseValues(t *testing.T) {
{Name: "templates/hello", Data: []byte("hello: world")},
{Name: "templates/hooks", Data: []byte(manifestWithHook)},
},
- Values: &chart.Config{Raw: "defaultFoo: defaultBar"},
+ Values: []byte("defaultFoo: defaultBar"),
},
- Values: &chart.Config{Raw: "foo: bar"},
+ Values: []byte("foo: bar"),
}
- fmt.Println("Running Install release with foo: bar override")
- installResp, err := rs.InstallRelease(installReq)
+ t.Log("Running Install release with foo: bar override")
+ rel, err := rs.InstallRelease(installReq)
if err != nil {
t.Fatal(err)
}
- rel := installResp
req := &hapi.UpdateReleaseRequest{
Name: rel.Name,
Chart: &chart.Chart{
@@ -157,22 +156,21 @@ func TestUpdateRelease_ComplexReuseValues(t *testing.T) {
{Name: "templates/hello", Data: []byte("hello: world")},
{Name: "templates/hooks", Data: []byte(manifestWithUpgradeHooks)},
},
- Values: &chart.Config{Raw: "defaultFoo: defaultBar"},
+ Values: []byte("defaultFoo: defaultBar"),
},
}
- fmt.Println("Running Update release with no overrides and no reuse-values flag")
- res, err := rs.UpdateRelease(req)
+ t.Log("Running Update release with no overrides and no reuse-values flag")
+ rel, err = rs.UpdateRelease(req)
if err != nil {
t.Fatalf("Failed updated: %s", err)
}
expect := "foo: bar"
- if res.Config != nil && res.Config.Raw != expect {
- t.Errorf("Expected chart values to be %q, got %q", expect, res.Config.Raw)
+ if rel.Config != nil && !bytes.Equal(rel.Config, []byte(expect)) {
+ t.Errorf("Expected chart values to be %q, got %q", expect, string(rel.Config))
}
- rel = res
req = &hapi.UpdateReleaseRequest{
Name: rel.Name,
Chart: &chart.Chart{
@@ -181,13 +179,13 @@ func TestUpdateRelease_ComplexReuseValues(t *testing.T) {
{Name: "templates/hello", Data: []byte("hello: world")},
{Name: "templates/hooks", Data: []byte(manifestWithUpgradeHooks)},
},
- Values: &chart.Config{Raw: "defaultFoo: defaultBar"},
+ Values: []byte("defaultFoo: defaultBar"),
},
- Values: &chart.Config{Raw: "foo2: bar2"},
+ Values: []byte("foo2: bar2"),
ReuseValues: true,
}
- fmt.Println("Running Update release with foo2: bar2 override and reuse-values")
+ t.Log("Running Update release with foo2: bar2 override and reuse-values")
rel, err = rs.UpdateRelease(req)
if err != nil {
t.Fatalf("Failed updated: %s", err)
@@ -195,8 +193,8 @@ func TestUpdateRelease_ComplexReuseValues(t *testing.T) {
// This should have the newly-passed overrides.
expect = "foo: bar\nfoo2: bar2\n"
- if rel.Config != nil && rel.Config.Raw != expect {
- t.Errorf("Expected request config to be %q, got %q", expect, rel.Config.Raw)
+ if rel.Config != nil && !bytes.Equal(rel.Config, []byte(expect)) {
+ t.Errorf("Expected request config to be %q, got %q", expect, string(rel.Config))
}
req = &hapi.UpdateReleaseRequest{
@@ -207,20 +205,20 @@ func TestUpdateRelease_ComplexReuseValues(t *testing.T) {
{Name: "templates/hello", Data: []byte("hello: world")},
{Name: "templates/hooks", Data: []byte(manifestWithUpgradeHooks)},
},
- Values: &chart.Config{Raw: "defaultFoo: defaultBar"},
+ Values: []byte("defaultFoo: defaultBar"),
},
- Values: &chart.Config{Raw: "foo: baz"},
+ Values: []byte("foo: baz"),
ReuseValues: true,
}
- fmt.Println("Running Update release with foo=baz override with reuse-values flag")
- res, err = rs.UpdateRelease(req)
+ t.Log("Running Update release with foo=baz override with reuse-values flag")
+ rel, err = rs.UpdateRelease(req)
if err != nil {
t.Fatalf("Failed updated: %s", err)
}
expect = "foo: baz\nfoo2: bar2\n"
- if res.Config != nil && res.Config.Raw != expect {
- t.Errorf("Expected chart values to be %q, got %q", expect, res.Config.Raw)
+ if rel.Config != nil && !bytes.Equal(rel.Config, []byte(expect)) {
+ t.Errorf("Expected chart values to be %q, got %q", expect, rel.Config)
}
}
@@ -238,9 +236,9 @@ func TestUpdateRelease_ReuseValues(t *testing.T) {
{Name: "templates/hooks", Data: []byte(manifestWithUpgradeHooks)},
},
// Since reuseValues is set, this should get ignored.
- Values: &chart.Config{Raw: "foo: bar\n"},
+ Values: []byte("foo: bar\n"),
},
- Values: &chart.Config{Raw: "name2: val2"},
+ Values: []byte("name2: val2"),
ReuseValues: true,
}
res, err := rs.UpdateRelease(req)
@@ -249,13 +247,13 @@ func TestUpdateRelease_ReuseValues(t *testing.T) {
}
// This should have been overwritten with the old value.
expect := "name: value\n"
- if res.Chart.Values != nil && res.Chart.Values.Raw != expect {
- t.Errorf("Expected chart values to be %q, got %q", expect, res.Chart.Values.Raw)
+ if res.Chart.Values != nil && !bytes.Equal(res.Chart.Values, []byte(expect)) {
+ t.Errorf("Expected chart values to be %q, got %q", expect, res.Chart.Values)
}
// This should have the newly-passed overrides and any other computed values. `name: value` comes from release Config via releaseStub()
expect = "name: value\nname2: val2\n"
- if res.Config != nil && res.Config.Raw != expect {
- t.Errorf("Expected request config to be %q, got %q", expect, res.Config.Raw)
+ if res.Config != nil && !bytes.Equal(res.Config, []byte(expect)) {
+ t.Errorf("Expected request config to be %q, got %q", expect, res.Config)
}
compareStoredAndReturnedRelease(t, *rs, res)
}
@@ -283,8 +281,8 @@ func TestUpdateRelease_ResetReuseValues(t *testing.T) {
t.Fatalf("Failed updated: %s", err)
}
// This should have been unset. Config: &chart.Config{Raw: `name: value`},
- if res.Config != nil && res.Config.Raw != "" {
- t.Errorf("Expected chart config to be empty, got %q", res.Config.Raw)
+ if len(res.Config) > 0 {
+ t.Errorf("Expected chart config to be empty, got %q", res.Config)
}
compareStoredAndReturnedRelease(t, *rs, res)
}