Merge branch 'master' into keep-history

docs/parameter_reference.md

@@ -19,6 +19,7 @@ Linting is only triggered when the `helm_command` setting is "lint".
 | values        | list\<string\> |          | Chart values to use as the `--set` argument to `helm lint`. |
 | string_values | list\<string\> |          | Chart values to use as the `--set-string` argument to `helm lint`. |
 | values_files  | list\<string\> |          | Values to use as `--values` arguments to `helm lint`. |
+| lint_strictly | boolean        |          | Pass `--strict` to `helm lint`, to turn warnings into errors. |
 
 ## Installation
 
@@ -62,7 +63,9 @@ Uninstallations are triggered when the `helm_command` setting is "uninstall" or
 
 ### Where to put settings
 
-Any setting can go in either the `settings` or `environment` section.
+Any setting can go in either the `settings` or `environment` section. If a setting exists in _both_ sections, the version in `environment` will override the version in `settings`.
+
+We recommend putting all drone-helm3 configuration in the `settings` block and limiting the `environment` block to variables that are used when building your charts.
 
 ### Formatting non-string values
 

internal/helm/config.go

@@ -43,6 +43,7 @@ type Config struct {
 	Chart              string   ``                                   // Chart argument to use in applicable helm commands
 	Release            string   ``                                   // Release argument to use in applicable helm commands
 	Force              bool     ``                                   // Pass --force to applicable helm commands
+	LintStrictly       bool     `split_words:"true"`                 // Pass --strict to `helm lint`
 
 	Stdout io.Writer `ignored:"true"`
 	Stderr io.Writer `ignored:"true"`

internal/helm/plan.go

@@ -134,7 +134,8 @@ var lint = func(cfg Config) []Step {
 		steps = append(steps, depUpdate(cfg)...)
 	}
 	steps = append(steps, &run.Lint{
-		Chart: cfg.Chart,
+		Chart:  cfg.Chart,
+		Strict: cfg.LintStrictly,
 	})
 
 	return steps

internal/helm/plan_test.go

@@ -301,14 +301,16 @@ func (suite *PlanTestSuite) TestAddRepos() {
 
 func (suite *PlanTestSuite) TestLint() {
 	cfg := Config{
-		Chart: "./flow",
+		Chart:        "./flow",
+		LintStrictly: true,
 	}
 
 	steps := lint(cfg)
 	suite.Equal(1, len(steps))
 
 	want := &run.Lint{
-		Chart: "./flow",
+		Chart:  "./flow",
+		Strict: true,
 	}
 	suite.Equal(want, steps[0])
 }

internal/run/lint.go

@@ -6,8 +6,9 @@ import (
 
 // Lint is an execution step that calls `helm lint` when executed.
 type Lint struct {
-	Chart string
+	Chart  string
-	cmd   cmd
+	Strict bool
+	cmd    cmd
 }
 
 // Execute executes the `helm lint` command.
@@ -41,6 +42,9 @@ func (l *Lint) Prepare(cfg Config) error {
 	for _, vFile := range cfg.ValuesFiles {
 		args = append(args, "--values", vFile)
 	}
+	if l.Strict {
+		args = append(args, "--strict")
+	}
 
 	args = append(args, l.Chart)
 

internal/run/lint_test.go

@@ -87,7 +87,8 @@ func (suite *LintTestSuite) TestPrepareWithLintFlags() {
 	}
 
 	l := Lint{
-		Chart: "./uk/top_40",
+		Chart:  "./uk/top_40",
+		Strict: true,
 	}
 
 	command = func(path string, args ...string) cmd {
@@ -97,6 +98,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