diff --git a/pkg/action/lint.go b/pkg/action/lint.go index 8be29a4de..6c010e26e 100644 --- a/pkg/action/lint.go +++ b/pkg/action/lint.go @@ -54,6 +54,7 @@ func (l *Lint) Run(paths []string, vals map[string]interface{}) *LintResult { } return result } + func lintChart(path string, vals map[string]interface{}, namespace string, kubeVersion *chartutil.KubeVersion, ignoreFilePath string) (support.Linter, error) { var chartPath string linter := support.Linter{} @@ -91,9 +92,5 @@ func lintChart(path string, vals map[string]interface{}, namespace string, kubeV if _, err := os.Stat(filepath.Join(chartPath, "Chart.yaml")); err != nil { return linter, errors.Wrap(err, "Chart.yaml file not found in chart") } - ignorePatterns, err := rules.ParseIgnoreFile(ignoreFilePath) - if err != nil { - return linter, errors.Wrap(err, "failed to parse .helmlintignore file") - } - return lint.AllWithKubeVersion(chartPath, vals, namespace, kubeVersion, ignorePatterns), nil + return lint.AllWithKubeVersion(chartPath, vals, namespace, kubeVersion, ignoreFilePath), nil } diff --git a/pkg/lint/lint.go b/pkg/lint/lint.go index 53b45c5e6..5d79c5c32 100644 --- a/pkg/lint/lint.go +++ b/pkg/lint/lint.go @@ -25,7 +25,7 @@ import ( func All(basedir string, values map[string]interface{}, namespace string, _ bool) support.Linter { return AllWithKubeVersion(basedir, values, namespace, nil, "") } -func AllWithKubeVersion(basedir string, values map[string]interface{}, namespace string, kubeVersion *chartutil.KubeVersion, lintIgnoreFile string) support.Linter { +func AllWithKubeVersion(chartPath string, vals map[string]interface{}, namespace string, kubeVersion *chartutil.KubeVersion, ignoreFilePath string) support.Linter chartDir, _ := filepath.Abs(basedir) var ignorePatterns []string if lintIgnoreFile != "" {