fix: set CSI params for Nomad runner install.

hashicorp · Nov 2, 2022 · a368630 · a368630
1 parent 43ca65f
commit a368630
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/.changelog/4157.txt b/.changelog/4157.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+install/nomad: Update installation with Nomad to use CSI parameters.
+```
diff --git a/internal/runnerinstall/nomad.go b/internal/runnerinstall/nomad.go
@@ -44,6 +44,7 @@ type NomadConfig struct {
 	CsiFS                string            `hcl:"csi_fs,optional"`
 	CsiTopologies        map[string]string `hcl:"nomad_csi_topologies,optional"`
 	CsiExternalId        string            `hcl:"nomad_csi_external_id,optional"`
+	CsiParams            map[string]string `hcl:"nomad_csi_params,optional"`
 	CsiPluginId          string            `hcl:"nomad_csi_plugin_id"`
 	CsiSecrets           map[string]string `hcl:"nomad_csi_secrets,optional"`
 	CsiVolume            string            `hcl:"nomad_csi_volume,optional"`
@@ -101,7 +102,7 @@ func (i *NomadRunnerInstaller) Install(ctx context.Context, opts *InstallOpts) e
 			i.Config.CsiVolumeCapacityMax,
 			i.Config.CsiTopologies,
 			i.Config.CsiSecrets,
-			map[string]string{},
+			i.Config.CsiParams,
 		)
 		if err != nil {
 			return fmt.Errorf("error creating Nomad persistent volume: %s", clierrors.Humanize(err))
@@ -281,6 +282,12 @@ func (i *NomadRunnerInstaller) InstallFlags(set *flag.Set) {
 		Default: nomadutil.DefaultCSIVolumeMountFS,
 	})
 
+	set.StringMapVar(&flag.StringMapVar{
+		Name:   "nomad-csi-params",
+		Target: &i.Config.CsiParams,
+		Usage:  "Parameters passed directly to the CSI plugin to configure the volume.",
+	})
+
 	set.StringMapVar(&flag.StringMapVar{
 		Name:   "nomad-csi-topologies",
 		Target: &i.Config.CsiTopologies,

diff --git a/internal/serverinstall/nomad.go b/internal/serverinstall/nomad.go
@@ -642,6 +642,7 @@ func (i *NomadInstaller) InstallRunner(
 			CsiFS:                 i.config.csiFS,
 			CsiTopologies:         i.config.csiTopologies,
 			CsiExternalId:         i.config.csiExternalId,
+			CsiParams:             i.config.csiParams,
 			CsiPluginId:           i.config.csiPluginId,
 			CsiSecrets:            i.config.csiSecrets,
 			CsiVolume:             i.config.runnerCsiVolume,

diff --git a/website/content/commands/runner-install.mdx b/website/content/commands/runner-install.mdx
@@ -89,6 +89,7 @@ the install, the command would be:
 - `-nomad-csi-volume-capacity-min=<int>` - Nomad CSI volume capacity minimum, in bytes. The default is 1073741824.
 - `-nomad-csi-volume-capacity-max=<int>` - Nomad CSI volume capacity maximum, in bytes. The default is 2147483648.
 - `-nomad-csi-fs=<string>` - Nomad CSI volume mount option file system. The default is xfs.
+- `-nomad-csi-params=<key=value>` - Parameters passed directly to the CSI plugin to configure the volume.
 - `-nomad-csi-topologies=<key=value>` - Locations from which the Nomad Volume will be accessible.
 - `-nomad-csi-external-id=<string>` - The ID of the physical volume from the Nomad storage provider.
 - `-nomad-csi-secrets=<key=value>` - Credentials for publishing volume for Waypoint runner.