add new skip-charts flag for so that repeated can bypass chart reinstalls

Author: git-ival

cmd/dartboard/main.go

@@ -52,9 +52,16 @@ func main() {
 				Action:      subcommands.Deploy,
 				Flags: []cli.Flag{
 					&cli.BoolFlag{
-						Name:  subcommands.ArgSkipApply,
-						Value: false,
-						Usage: "skip `tofu apply`, assume apply was already called",
+						Name:        subcommands.ArgSkipApply,
+						Value:       false,
+						Usage:       "skip 'tofu apply', assume apply was already called",
+						DefaultText: "false",
+					},
+					&cli.BoolFlag{
+						Name:        subcommands.ArgSkipCharts,
+						Value:       false,
+						Usage:       "skip 'helm install' for all charts, assume charts have already been installed for upstream and tester clusters",
+						DefaultText: "false",
 					},
 				},
 			},

cmd/dartboard/subcommands/deploy.go

@@ -58,6 +58,10 @@ func Deploy(cli *cli.Context) error {
 		if err = tf.Apply(); err != nil {
 			return err
 		}
+	} else {
+		if err = tf.Output(nil, false); err != nil {
+			return err
+		}
 	}
 
 	clusters, custom_clusters, err := tf.ParseOutputs()
@@ -67,7 +71,7 @@ func Deploy(cli *cli.Context) error {
 
 	// Helm charts
 	tester := clusters["tester"]
-	if len(tester.Kubeconfig) > 0 {
+	if len(tester.Kubeconfig) > 0 && !cli.Bool(ArgSkipCharts) {
 		if err = chartInstall(tester.Kubeconfig, chart{"k6-files", "tester", "k6-files"}, nil); err != nil {
 			return err
 		}
@@ -97,25 +101,27 @@ func Deploy(cli *cli.Context) error {
 		}
 	}
 
-	if err = chartInstallCertManager(r, &upstream); err != nil {
-		return err
-	}
-	if err = chartInstallRancher(r, rancherImageTag, &upstream); err != nil {
-		return err
-	}
-	if err = chartInstallRancherIngress(&upstream); err != nil {
-		return err
-	}
-	if err = chartInstallCgroupsExporter(&upstream); err != nil {
-		return err
-	}
+	if !cli.Bool(ArgSkipCharts) {
+		if err = chartInstallCertManager(r, &upstream); err != nil {
+			return err
+		}
+		if err = chartInstallRancher(r, rancherImageTag, &upstream); err != nil {
+			return err
+		}
+		if err = chartInstallRancherIngress(&upstream); err != nil {
+			return err
+		}
+		if err = chartInstallCgroupsExporter(&upstream); err != nil {
+			return err
+		}
 
-	// Wait for Rancher deployments to be complete, or subsequent steps may fail
-	if err = kubectl.WaitRancher(upstream.Kubeconfig); err != nil {
-		return err
-	}
-	if err = chartInstallRancherMonitoring(r, &upstream); err != nil {
-		return err
+		// Wait for Rancher deployments to be complete, or subsequent steps may fail
+		if err = kubectl.WaitRancher(upstream.Kubeconfig); err != nil {
+			return err
+		}
+		if err = chartInstallRancherMonitoring(r, &upstream); err != nil {
+			return err
+		}
 	}
 
 	// Setup rancher client

cmd/dartboard/subcommands/utils.go

@@ -31,8 +31,9 @@ import (
 )
 
 const (
-	ArgDart      = "dart"
-	ArgSkipApply = "skip-apply"
+	ArgDart       = "dart"
+	ArgSkipApply  = "skip-apply"
+	ArgSkipCharts = "skip-charts"
 )
 
 type clusterAddress struct {