From f81dae3d8182bd37a1408075ebf228594530e5d6 Mon Sep 17 00:00:00 2001
From: Tim Gross <tgross@hashicorp.com>
Date: Mon, 11 May 2020 16:28:20 -0400
Subject: [PATCH] remove MountOptions from volume stub

---
 api/csi.go             | 1 -
 command/node_status.go | 6 ++----
 nomad/structs/csi.go   | 2 --
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/api/csi.go b/api/csi.go
index 72edd051f6d..d7e94d6f173 100644
--- a/api/csi.go
+++ b/api/csi.go
@@ -165,7 +165,6 @@ type CSIVolumeListStub struct {
 	Topologies          []*CSITopology
 	AccessMode          CSIVolumeAccessMode
 	AttachmentMode      CSIVolumeAttachmentMode
-	MountOptions        *CSIMountOptions
 	Schedulable         bool
 	PluginID            string
 	Provider            string
diff --git a/command/node_status.go b/command/node_status.go
index 9ada5b07d54..cb882acd3eb 100644
--- a/command/node_status.go
+++ b/command/node_status.go
@@ -569,19 +569,17 @@ func (c *NodeStatusCommand) outputNodeCSIVolumeInfo(client *api.Client, node *ap
 
 	// Output the volumes in name order
 	output := make([]string, 0, len(names)+1)
-	output = append(output, "ID|Name|Plugin ID|Schedulable|Provider|Access Mode|Mount Options")
+	output = append(output, "ID|Name|Plugin ID|Schedulable|Provider|Access Mode")
 	for _, name := range names {
 		v := volumes[name]
-		r := requests[v.ID]
 		output = append(output, fmt.Sprintf(
-			"%s|%s|%s|%t|%s|%s|%s",
+			"%s|%s|%s|%t|%s|%s",
 			v.ID,
 			name,
 			v.PluginID,
 			v.Schedulable,
 			v.Provider,
 			v.AccessMode,
-			csiVolMountOption(v.MountOptions, r.MountOptions),
 		))
 	}
 
diff --git a/nomad/structs/csi.go b/nomad/structs/csi.go
index 28721537cf0..f017cab0034 100644
--- a/nomad/structs/csi.go
+++ b/nomad/structs/csi.go
@@ -271,7 +271,6 @@ type CSIVolListStub struct {
 	Topologies          []*CSITopology
 	AccessMode          CSIVolumeAccessMode
 	AttachmentMode      CSIVolumeAttachmentMode
-	MountOptions        *CSIMountOptions
 	CurrentReaders      int
 	CurrentWriters      int
 	Schedulable         bool
@@ -329,7 +328,6 @@ func (v *CSIVolume) Stub() *CSIVolListStub {
 		Topologies:          v.Topologies,
 		AccessMode:          v.AccessMode,
 		AttachmentMode:      v.AttachmentMode,
-		MountOptions:        v.MountOptions,
 		CurrentReaders:      len(v.ReadAllocs),
 		CurrentWriters:      len(v.WriteAllocs),
 		Schedulable:         v.Schedulable,