Skip to content

Commit

Permalink
cli: undo volume namespace output since it's done in #17911
Browse files Browse the repository at this point in the history
  • Loading branch information
lgfa29 committed Jul 12, 2023
1 parent 26a0dbc commit 06e38d6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
5 changes: 2 additions & 3 deletions command/node_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -702,15 +702,14 @@ 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|Namespace|Plugin ID|Schedulable|Provider|Access Mode")
output = append(output, "ID|Name|Plugin ID|Schedulable|Provider|Access Mode")
for _, name := range names {
v, ok := volumes[name]
if ok {
output = append(output, fmt.Sprintf(
"%s|%s|%s|%s|%t|%s|%s",
"%s|%s|%s|%t|%s|%s",
v.ID,
name,
v.Namespace,
v.PluginID,
v.Schedulable,
v.Provider,
Expand Down
5 changes: 2 additions & 3 deletions command/volume_status_csi.go
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,11 @@ func (c *VolumeStatusCommand) csiFormatVolumes(vols []*api.CSIVolumeListStub) (s
// Format the volumes, assumes that we're already sorted by volume ID
func csiFormatSortedVolumes(vols []*api.CSIVolumeListStub) (string, error) {
rows := make([]string, len(vols)+1)
rows[0] = "ID|Name|Namespace|Plugin ID|Schedulable|Access Mode"
rows[0] = "ID|Name|Plugin ID|Schedulable|Access Mode"
for i, v := range vols {
rows[i+1] = fmt.Sprintf("%s|%s|%s|%s|%t|%s",
rows[i+1] = fmt.Sprintf("%s|%s|%s|%t|%s",
v.ID,
v.Name,
v.Namespace,
v.PluginID,
v.Schedulable,
v.AccessMode,
Expand Down

0 comments on commit 06e38d6

Please sign in to comment.