Merge branch 'master' into values-arent-global

This commit is contained in:
Erin Call
2020-01-02 12:29:15 -08:00
6 changed files with 14 additions and 1 deletions

View File

@@ -10,6 +10,7 @@ type Lint struct {
Values string
StringValues string
ValuesFiles []string
Strict bool
cmd cmd
}
@@ -44,6 +45,9 @@ func (l *Lint) Prepare(cfg Config) error {
for _, vFile := range l.ValuesFiles {
args = append(args, "--values", vFile)
}
if l.Strict {
args = append(args, "--strict")
}
args = append(args, l.Chart)

View File

@@ -87,6 +87,7 @@ func (suite *LintTestSuite) TestPrepareWithLintFlags() {
Values: "width=5",
StringValues: "version=2.0",
ValuesFiles: []string{"/usr/local/underrides", "/usr/local/overrides"},
Strict: true,
}
command = func(path string, args ...string) cmd {
@@ -96,6 +97,7 @@ func (suite *LintTestSuite) TestPrepareWithLintFlags() {
"--set-string", "version=2.0",
"--values", "/usr/local/underrides",
"--values", "/usr/local/overrides",
"--strict",
"./uk/top_40"}, args)
return suite.mockCmd