kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-01 16:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

CSI: sort capabilities in plugin status (#12154)

Browse Source 
Also fix `LIST_SNAPSHOTS` capability name
This commit is contained in:
Tim Gross
2022-03-01 07:59:31 -05:00
committed by GitHub
parent 05034a6cd0
commit c06f31eef0
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/12154.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:improvement
csi: Sort allocations in `plugin status` output
```

6
command/plugin_status_csi.go
View File

@@ -148,7 +148,7 @@ func (c *PluginStatusCommand) formatControllerCaps(controllers map[string]*api.C
caps = append(caps, "CREATE_DELETE_SNAPSHOT")
fallthrough
case info.SupportsListSnapshots:
caps = append(caps, "CREATE_LIST_SNAPSHOTS")
caps = append(caps, "LIST_SNAPSHOTS")
fallthrough
case info.SupportsClone:
caps = append(caps, "CLONE_VOLUME")
@@ -177,7 +177,7 @@ func (c *PluginStatusCommand) formatControllerCaps(controllers map[string]*api.C
return ""
}
return strings.Join(caps, "\n\t")
return " " + strings.Join(sort.StringSlice(caps), "\n ")
}
func (c *PluginStatusCommand) formatNodeCaps(nodes map[string]*api.CSIInfo) string {
@@ -205,5 +205,5 @@ func (c *PluginStatusCommand) formatNodeCaps(nodes map[string]*api.CSIInfo) stri
return ""
}
return " " + strings.Join(caps, "\n ")
return " " + strings.Join(sort.StringSlice(caps), "\n ")
}