csi/ui: show Node Only for volumes when controllers aren't required

Plugin health for controllers should show "Node Only" in the UI only when both conditions are true: controllers are not required, and no controllers have registered themselves (0 expected controllers). This accounts for "monolith" plugins which might register as both controllers and nodes but not necessarily have `ControllerRequired = true` because they don't implement the Controller RPC endpoints we need (this requirement was added in #7844) This changeset includes the following fixes: * Update the Plugins tab of the UI so that monolith plugins don't show "Node Only" once they've registered. * Add the missing "Node Only" logic to the Volumes tab of the UI.
hashicorp · Nov 20, 2020 · c6004e5 · c6004e5
1 parent 8a66f11
commit c6004e5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/ui/app/templates/csi/plugins/index.hbs b/ui/app/templates/csi/plugins/index.hbs
@@ -46,7 +46,12 @@
                   {{if (gt row.model.controllersHealthy 0) "Healthy" "Unhealthy"}}
                   ({{row.model.controllersHealthy}}/{{row.model.controllersExpected}})
                 {{else}}
+                  {{#if (gt row.model.controllersExpected 0)}}
+                  {{if (gt row.model.controllersHealthy 0) "Healthy" "Unhealthy"}}
+                  ({{row.model.controllersHealthy}}/{{row.model.controllersExpected}})
+                  {{else}}
                   <em class="is-faded">Node Only</em>
+                  {{/if}}
                 {{/if}}
               </td>
               <td data-test-plugin-node-health>

diff --git a/ui/app/templates/csi/volumes/index.hbs b/ui/app/templates/csi/volumes/index.hbs
@@ -45,8 +45,17 @@
               </td>
               <td data-test-volume-schedulable>{{if row.model.schedulable "Schedulable" "Unschedulable"}}</td>
               <td data-test-volume-controller-health>
-                {{if (gt row.model.controllersHealthy 0) "Healthy" "Unhealthy"}}
-                ({{row.model.controllersHealthy}}/{{row.model.controllersExpected}})
+                {{#if row.model.controllerRequired}}
+                  {{if (gt row.model.controllersHealthy 0) "Healthy" "Unhealthy"}}
+                  ({{row.model.controllersHealthy}}/{{row.model.controllersExpected}})
+                {{else}}
+                  {{#if (gt row.model.controllersExpected 0)}}
+                  {{if (gt row.model.controllersHealthy 0) "Healthy" "Unhealthy"}}
+                  ({{row.model.controllersHealthy}}/{{row.model.controllersExpected}})
+                  {{else}}
+                  <em class="is-faded">Node Only</em>
+                  {{/if}}
+                {{/if}}
               </td>
               <td data-test-volume-node-health>
                 {{if (gt row.model.nodesHealthy 0) "Healthy" "Unhealthy"}}