Various improvements

Author: ewoutp

dashboard/assets.go

@@ -23,7 +23,7 @@ const StyledContentBox = styled('div')`
 const ListView = () => (
   <div>
     <Header dividing>
-      ArangoDeployments
+      ArangoDeployment resources
     </Header>
     <DeploymentList/>
   </div>

dashboard/src/deployment/DeploymentOperator.js

@@ -21,7 +21,7 @@ const StyledContentBox = styled('div')`
 const ListView = () => (
   <div>
     <Header dividing>
-      ArangoLocalStorages
+      ArangoLocalStorage resources
     </Header>
     <StorageList/>
   </div>

dashboard/src/storage/StorageOperator.js

@@ -19,6 +19,8 @@ const HeaderView = ({loading}) => (
     <Table.Row>
       <Table.HeaderCell>State</Table.HeaderCell>
       <Table.HeaderCell>Name</Table.HeaderCell>
+      <Table.HeaderCell>Capacity</Table.HeaderCell>
+      <Table.HeaderCell>Node</Table.HeaderCell>
       <Table.HeaderCell>
         Actions
         <LoaderBox><Loader size="mini" active={loading} inline/></LoaderBox>
@@ -27,7 +29,7 @@ const HeaderView = ({loading}) => (
   </Table.Header>
 );
 
-const RowView = ({name, stateColor, describeCommand, deleteCommand}) => (
+const RowView = ({name, stateColor, nodeName, capacity, describeCommand, deleteCommand}) => (
   <Table.Row>
     <Table.Cell>
       <Popup trigger={<Icon name={(stateColor==="green") ? "check" : "bell"} color={stateColor}/>}>
@@ -37,6 +39,12 @@ const RowView = ({name, stateColor, describeCommand, deleteCommand}) => (
     <Table.Cell>
       {name}
     </Table.Cell>
+    <Table.Cell>
+      {capacity}
+    </Table.Cell>
+    <Table.Cell>
+      {nodeName}
+    </Table.Cell>
     <Table.Cell>
       <CommandInstruction 
           trigger={<Icon link name="zoom"/>}
@@ -66,6 +74,8 @@ const ListView = ({items, loading}) => (
             key={item.name} 
             name={item.name}
             stateColor={item.state_color}
+            nodeName={item.node_name}
+            capacity={item.capacity}
             deleteCommand={createDeleteCommand(item.name)}
             describeCommand={createDescribeCommand(item.name)}
           />

dashboard/src/storage/VolumeList.js

@@ -89,19 +89,25 @@ func newLocalStorageInfoDetails(ls LocalStorage) LocalStorageInfoDetails {
 type Volume interface {
 	Name() string
 	StateColor() StateColor
+	NodeName() string
+	Capacity() string
 }
 
 // VolumeInfo contained the information returned per volume that is created on behalf of a local storage.
 type VolumeInfo struct {
 	Name       string     `json:"name"`
 	StateColor StateColor `json:"state_color"`
+	NodeName   string     `json:"node_name"`
+	Capacity   string     `json:"capacity"`
 }
 
 // newVolumeInfo creates a VolumeInfo for the given volume
 func newVolumeInfo(v Volume) VolumeInfo {
 	return VolumeInfo{
 		Name:       v.Name(),
 		StateColor: v.StateColor(),
+		NodeName:   v.NodeName(),
+		Capacity:   v.Capacity(),
 	}
 }
 

pkg/server/handlers_storage.go

@@ -174,6 +174,14 @@ func (ls *LocalStorage) run() {
 	ls.image = image
 	ls.imagePullPolicy = pullPolicy
 
+	// Set state
+	if ls.status.State == api.LocalStorageStateNone {
+		ls.status.State = api.LocalStorageStateCreating
+		if err := ls.updateCRStatus(); err != nil {
+			ls.createEvent(k8sutil.NewErrorEvent("Failed to update LocalStorage state", err, ls.apiObject))
+		}
+	}
+
 	// Create StorageClass
 	if err := ls.ensureStorageClass(ls.apiObject); err != nil {
 		ls.failOnError(err, "Failed to create storage class")
@@ -260,6 +268,13 @@ func (ls *LocalStorage) run() {
 					recentInspectionErrors++
 				}
 			} else {
+				if ls.status.State == api.LocalStorageStateCreating || ls.status.State == api.LocalStorageStateNone {
+					ls.status.State = api.LocalStorageStateRunning
+					if err := ls.updateCRStatus(); err != nil {
+						hasError = true
+						ls.createEvent(k8sutil.NewErrorEvent("Failed to update LocalStorage state", err, ls.apiObject))
+					}
+				}
 				recentInspectionErrors = 0
 			}
 

pkg/storage/local_storage.go

@@ -23,6 +23,9 @@
 package storage
 
 import (
+	"sort"
+
+	api "github.com/arangodb/kube-arangodb/pkg/apis/storage/v1alpha"
 	"github.com/arangodb/kube-arangodb/pkg/server"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -39,8 +42,14 @@ func (ls *LocalStorage) LocalPaths() []string {
 
 // StateColor returns a color describing the state of the local storage resource
 func (ls *LocalStorage) StateColor() server.StateColor {
-	// TODO
-	return server.StateYellow
+	switch ls.status.State {
+	case api.LocalStorageStateRunning:
+		return server.StateGreen
+	case api.LocalStorageStateFailed:
+		return server.StateRed
+	default:
+		return server.StateYellow
+	}
 }
 
 // StorageClass returns the name of the StorageClass specified in the local storage resource
@@ -66,5 +75,8 @@ func (ls *LocalStorage) Volumes() []server.Volume {
 			result = append(result, serverVolume(pv))
 		}
 	}
+	sort.Slice(result, func(i, j int) bool {
+		return result[i].Name() < result[j].Name()
+	})
 	return result
 }

pkg/storage/server_api.go

@@ -34,6 +34,7 @@ func (v serverVolume) Name() string {
 	return v.ObjectMeta.GetName()
 }
 
+// StateColor returns a color representing the state of the volume
 func (v serverVolume) StateColor() server.StateColor {
 	switch v.Status.Phase {
 	default:
@@ -44,3 +45,17 @@ func (v serverVolume) StateColor() server.StateColor {
 		return server.StateRed
 	}
 }
+
+// NodeName returns the name of the node the volume is created on volume
+func (v serverVolume) NodeName() string {
+	return v.GetAnnotations()[nodeNameAnnotation]
+}
+
+// Capacity returns the capacity of the volume in human readable form
+func (v serverVolume) Capacity() string {
+	c, found := v.Spec.Capacity[v1.ResourceStorage]
+	if found {
+		return c.String()
+	}
+	return "?"
+}