Introduce helm-extra-set-args

Signed-off-by: ilmax <[email protected]>

ct/cmd/install.go

@@ -77,6 +77,9 @@ func addInstallFlags(flags *flag.FlagSet) {
 	flags.String("release-label", "app.kubernetes.io/instance", heredoc.Doc(`
 		The label to be used as a selector when inspecting resources created by charts.
 		This is only used if namespace is specified`))
+	flags.String("helm-extra-set-args", "", heredoc.Doc(`
+		Additional arguments for Helm. Must be passed as a single quoted string
+		(e.g. "--set=name=value"`))
 }
 
 func install(cmd *cobra.Command, args []string) error {
@@ -91,7 +94,11 @@ func install(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("Error loading configuration: %s", err)
 	}
 
-	testing, err := chart.NewTesting(*configuration)
+	extraSetArgs, err := cmd.Flags().GetString("helm-extra-set-args")
+	if err != nil {
+		return err
+	}
+	testing, err := chart.NewTesting(*configuration, extraSetArgs)
 	if err != nil {
 		fmt.Println(err)
 	}

ct/cmd/lint.go

@@ -88,7 +88,8 @@ func lint(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("Error loading configuration: %s", err)
 	}
 
-	testing, err := chart.NewTesting(*configuration)
+	emptyExtraSetArgs := ""
+	testing, err := chart.NewTesting(*configuration, emptyExtraSetArgs)
 	if err != nil {
 		return err
 	}

ct/cmd/lintAndInstall.go

@@ -51,7 +51,11 @@ func lintAndInstall(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("Error loading configuration: %s", err)
 	}
 
-	testing, err := chart.NewTesting(*configuration)
+	extraSetArgs, err := cmd.Flags().GetString("helm-extra-set-args")
+	if err != nil {
+		return err
+	}
+	testing, err := chart.NewTesting(*configuration, extraSetArgs)
 	if err != nil {
 		return err
 	}

ct/cmd/listChanged.go

@@ -50,7 +50,8 @@ func listChanged(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("Error loading configuration: %s", err)
 	}
 
-	testing, err := chart.NewTesting(*configuration)
+	emptyExtraSetArgs := ""
+	testing, err := chart.NewTesting(*configuration, emptyExtraSetArgs)
 	if err != nil {
 		return err
 	}

doc/ct_install.md

@@ -49,7 +49,9 @@ ct install [flags]
       --excluded-charts strings        Charts that should be skipped. May be specified multiple times
                                        or separate values with commas
       --helm-extra-args string         Additional arguments for Helm. Must be passed as a single quoted string
-                                       (e.g. "--timeout 500"
+                                       (e.g. "--timeout 500")
+      --helm-extra-set-args string     Additional arguments for Helm. Must be passed as a single quoted string
+		                               (e.g. "--set=name=value")
       --helm-repo-extra-args strings   Additional arguments for the 'helm repo add' command to be
                                        specified on a per-repo basis with an equals sign as delimiter
                                        (e.g. 'myrepo=--username test --password secret'). May be specified

doc/ct_lint-and-install.md

@@ -41,7 +41,9 @@ ct lint-and-install [flags]
       --excluded-charts strings        Charts that should be skipped. May be specified multiple times
                                        or separate values with commas
       --helm-extra-args string         Additional arguments for Helm. Must be passed as a single quoted string
-                                       (e.g. "--timeout 500"
+                                       (e.g. "--timeout 500")
+      --helm-extra-set-args string     Additional arguments for Helm. Must be passed as a single quoted string
+		                           (e.g. "--set=name=value")                                       
       --helm-repo-extra-args strings   Additional arguments for the 'helm repo add' command to be
                                        specified on a per-repo basis with an equals sign as delimiter
                                        (e.g. 'myrepo=--username test --password secret'). May be specified

pkg/chart/chart.go

@@ -252,13 +252,13 @@ type TestResult struct {
 }
 
 // NewTesting creates a new Testing struct with the given config.
-func NewTesting(config config.Configuration) (Testing, error) {
+func NewTesting(config config.Configuration, extraSetArgs string) (Testing, error) {
 	procExec := exec.NewProcessExecutor(config.Debug)
 	extraArgs := strings.Fields(config.HelmExtraArgs)
 
 	testing := Testing{
 		config:           config,
-		helm:             tool.NewHelm(procExec, extraArgs),
+		helm:             tool.NewHelm(procExec, extraArgs, extraSetArgs),
 		git:              tool.NewGit(procExec),
 		kubectl:          tool.NewKubectl(procExec),
 		linter:           tool.NewLinter(procExec),

pkg/tool/helm.go

@@ -21,14 +21,16 @@ import (
 )
 
 type Helm struct {
-	exec      exec.ProcessExecutor
-	extraArgs []string
+	exec         exec.ProcessExecutor
+	extraArgs    []string
+	extraSetArgs string
 }
 
-func NewHelm(exec exec.ProcessExecutor, extraArgs []string) Helm {
+func NewHelm(exec exec.ProcessExecutor, extraArgs []string, extraSetArgs string) Helm {
 	return Helm{
-		exec:      exec,
-		extraArgs: extraArgs,
+		exec:         exec,
+		extraArgs:    extraArgs,
+		extraSetArgs: extraSetArgs,
 	}
 }
 
@@ -56,7 +58,7 @@ func (h Helm) InstallWithValues(chart string, valuesFile string, namespace strin
 	}
 
 	if err := h.exec.RunProcess("helm", "install", release, chart, "--namespace", namespace,
-		"--wait", values, h.extraArgs); err != nil {
+		"--wait", values, h.extraArgs, h.extraSetArgs); err != nil {
 		return err
 	}
 
@@ -65,7 +67,7 @@ func (h Helm) InstallWithValues(chart string, valuesFile string, namespace strin
 
 func (h Helm) Upgrade(chart string, namespace string, release string) error {
 	if err := h.exec.RunProcess("helm", "upgrade", release, chart, "--namespace", namespace,
-		"--reuse-values", "--wait", h.extraArgs); err != nil {
+		"--reuse-values", "--wait", h.extraArgs, h.extraSetArgs); err != nil {
 		return err
 	}