diff --git a/pkg/cmd/roachprod/install/cluster_synced.go b/pkg/cmd/roachprod/install/cluster_synced.go index 148652f19727..8bbc5ad7ae1f 100644 --- a/pkg/cmd/roachprod/install/cluster_synced.go +++ b/pkg/cmd/roachprod/install/cluster_synced.go @@ -69,7 +69,7 @@ type SyncedCluster struct { Nodes []int Secure bool CertsDir string - Env string + Env []string Args []string Tag string Impl ClusterImpl diff --git a/pkg/cmd/roachprod/install/cockroach.go b/pkg/cmd/roachprod/install/cockroach.go index 2bfa54e0cbe9..0daebb3bd885 100644 --- a/pkg/cmd/roachprod/install/cockroach.go +++ b/pkg/cmd/roachprod/install/cockroach.go @@ -436,10 +436,10 @@ func (h *crdbInstallHelper) generateStartCmd( LogDir: h.c.Impl.LogDir(h.c, nodes[nodeIdx]), KeyCmd: h.generateKeyCmd(nodeIdx, extraArgs), Tag: h.c.Tag, - EnvVars: append([]string{ + EnvVars: append(append([]string{ "GOTRACEBACK=crash", "COCKROACH_SKIP_ENABLING_DIAGNOSTIC_REPORTING=1", - }, h.getEnvVars()...), + }, h.c.Env...), h.getEnvVars()...), Binary: cockroachNodeBinary(h.c, nodes[nodeIdx]), StartCmd: startCmd, Args: args, diff --git a/pkg/cmd/roachprod/main.go b/pkg/cmd/roachprod/main.go index ba9105e6b542..c9d9b43cb8d9 100644 --- a/pkg/cmd/roachprod/main.go +++ b/pkg/cmd/roachprod/main.go @@ -185,7 +185,7 @@ Available clusters: c.Nodes = nodes c.Secure = secure c.CertsDir = certsDir - c.Env = strings.Join(nodeEnv, " ") + c.Env = nodeEnv c.Args = nodeArgs if tag != "" { c.Tag = "/" + tag