From 069eec9e425c727323d7eb866662c1cff67757e6 Mon Sep 17 00:00:00 2001 From: Matt Farina Date: Tue, 14 May 2019 14:46:40 -0400 Subject: [PATCH] Updatin gthe apiVersion linting for Helm v3 Signed-off-by: Matt Farina --- pkg/lint/rules/chartfile.go | 11 ++++++----- pkg/lint/rules/testdata/badchartfile/Chart.yaml | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/lint/rules/chartfile.go b/pkg/lint/rules/chartfile.go index 2f9707884..24c8a6f44 100644 --- a/pkg/lint/rules/chartfile.go +++ b/pkg/lint/rules/chartfile.go @@ -17,6 +17,7 @@ limitations under the License. package rules // import "helm.sh/helm/pkg/lint/rules" import ( + "fmt" "os" "path/filepath" @@ -48,7 +49,7 @@ func Chartfile(linter *support.Linter) { linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartNameDirMatch(linter.ChartDir, chartFile)) // Chart metadata - linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartApiVersion(chartFile)) + linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartAPIVersion(chartFile)) linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartVersion(chartFile)) linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartMaintainer(chartFile)) linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartSources(chartFile)) @@ -86,13 +87,13 @@ func validateChartNameDirMatch(chartDir string, cf *chart.Metadata) error { return nil } -func validateChartApiVersion(cf *chart.Metadata) error { - if cf.ApiVersion == "" { +func validateChartAPIVersion(cf *chart.Metadata) error { + if cf.APIVersion == "" { return errors.New("apiVersion is required") } - if cf.ApiVersion != "v1" { - return fmt.Errorf("apiVersion '%s' is not valid. The value must be \"v1\"", cf.ApiVersion) + if cf.APIVersion != "v1" && cf.APIVersion != "v2" { + return fmt.Errorf("apiVersion '%s' is not valid. The value must be either \"v1\" or \"v2\"", cf.APIVersion) } return nil diff --git a/pkg/lint/rules/testdata/badchartfile/Chart.yaml b/pkg/lint/rules/testdata/badchartfile/Chart.yaml index b64052eb9..dbb4a1501 100644 --- a/pkg/lint/rules/testdata/badchartfile/Chart.yaml +++ b/pkg/lint/rules/testdata/badchartfile/Chart.yaml @@ -1,4 +1,3 @@ -apiVersion: v1 description: A Helm chart for Kubernetes version: 0.0.0 home: ""