From ec9b086ac8ec1532fd31b350d4ee739d197fc775 Mon Sep 17 00:00:00 2001 From: Matt Butcher Date: Fri, 20 May 2016 11:35:58 -0600 Subject: [PATCH] fix(chart): change source to sources in chart file As a carryover from the days when we only allowed one source, the source field was still labeled 'source' instead of 'sources'. Fixed and updated all of the tests. --- pkg/chart/chartfile.go | 2 +- pkg/chart/testdata/badchartversion/Chart.yaml | 2 +- pkg/chart/testdata/frobnitz-0.0.1.tgz | Bin 1153 -> 1136 bytes pkg/chart/testdata/frobnitz/Chart.yaml | 2 +- pkg/chart/testdata/sprocket/Chart.yaml | 2 -- 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkg/chart/chartfile.go b/pkg/chart/chartfile.go index 21687b435..effde9cc1 100644 --- a/pkg/chart/chartfile.go +++ b/pkg/chart/chartfile.go @@ -30,7 +30,7 @@ type Chartfile struct { Version string `yaml:"version"` Keywords []string `yaml:"keywords,omitempty"` Maintainers []*Maintainer `yaml:"maintainers,omitempty"` - Source []string `yaml:"source,omitempty"` + Source []string `yaml:"sources,omitempty"` Home string `yaml:"home"` } diff --git a/pkg/chart/testdata/badchartversion/Chart.yaml b/pkg/chart/testdata/badchartversion/Chart.yaml index 7d8fa8189..4407b54c3 100644 --- a/pkg/chart/testdata/badchartversion/Chart.yaml +++ b/pkg/chart/testdata/badchartversion/Chart.yaml @@ -8,6 +8,6 @@ maintainers: email: helm@example.com - name: Someone Else email: nobody@example.com -source: +sources: - https://example.com/foo/bar home: http://example.com diff --git a/pkg/chart/testdata/frobnitz-0.0.1.tgz b/pkg/chart/testdata/frobnitz-0.0.1.tgz index 83b92197941e823f8da9ac8a344e4b7dbfa9d3e0..38bfb862e4bdd5282af6b595c279a2980bc67368 100644 GIT binary patch delta 1131 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 PNXtJtmq?rdPyhf5L&a9D diff --git a/pkg/chart/testdata/frobnitz/Chart.yaml b/pkg/chart/testdata/frobnitz/Chart.yaml index 2fa9ac025..1920d219b 100644 --- a/pkg/chart/testdata/frobnitz/Chart.yaml +++ b/pkg/chart/testdata/frobnitz/Chart.yaml @@ -10,6 +10,6 @@ maintainers: email: helm@example.com - name: Someone Else email: nobody@example.com -source: +sources: - https://example.com/foo/bar home: http://example.com diff --git a/pkg/chart/testdata/sprocket/Chart.yaml b/pkg/chart/testdata/sprocket/Chart.yaml index 1a0b759b5..b09e10439 100644 --- a/pkg/chart/testdata/sprocket/Chart.yaml +++ b/pkg/chart/testdata/sprocket/Chart.yaml @@ -10,6 +10,4 @@ maintainers: email: helm@example.com - name: Someone Else email: nobody@example.com -source: -- https://example.com/foo/bar home: http://example.com