Member status

Author: ewoutp

dashboard/assets.go

@@ -9,7 +9,7 @@ const Field = styled('div')`
 `;
 
 const FieldLabel = styled('span')`
-  width: 5rem;
+  width: 9rem;
   display: inline-block;
 `;
 
@@ -26,13 +26,26 @@ const MemberListView = ({group, activeMemberID, onClick, members, namespace}) =>
   </Segment>
 );
 
+const MemberOfClusterView = (memberOfCluster) => {
+  if (memberOfCluster === 'never') {
+    return null;
+  }
+  return (
+    <Field>
+      <FieldLabel>Cluster member:</FieldLabel> 
+      {(memberOfCluster ==='true') ? "Yes" : "No"}
+    </Field>
+  );
+}
+
 const MemberView = ({memberInfo, namespace, active, onClick}) => (
   <List.Item>
     <Accordion>
       <Accordion.Title active={active} onClick={() => onClick(memberInfo.id)}>
-        <Icon name='dropdown' /> {memberInfo.id}
+        <Icon name='dropdown' /> <Icon name={memberInfo.ready ? "check" : "bell"} /> {memberInfo.id} 
       </Accordion.Title>
       <Accordion.Content active={active}>
+        {MemberOfClusterView(memberInfo.member_of_cluster)}
         <Field>
           <FieldLabel>Pod:</FieldLabel> 
           {memberInfo.pod_name || "-"}

dashboard/src/deployment/MemberList.js

@@ -23,8 +23,10 @@
 package deployment
 
 import (
-	api "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1alpha"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	api "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1alpha"
+	"github.com/arangodb/kube-arangodb/pkg/server"
 )
 
 type member struct {
@@ -66,3 +68,24 @@ func (m member) PVName() string {
 	}
 	return ""
 }
+
+func (m member) MemberOfCluster() server.MemberOfCluster {
+	switch m.group {
+	case api.ServerGroupDBServers, api.ServerGroupCoordinators:
+		if status, found := m.status(); found {
+			if status.Conditions.IsTrue(api.ConditionTypeMemberOfCluster) {
+				return server.IsMemberOfCluster
+			} else {
+				return server.IsNotMemberOfCluster
+			}
+		}
+	}
+	return server.NeverMemberOfCluster
+}
+
+func (m member) Ready() bool {
+	if status, found := m.status(); found {
+		return status.Conditions.IsTrue(api.ConditionTypeReady)
+	}
+	return false
+}

pkg/deployment/server_member_api.go

@@ -55,6 +55,8 @@ type Member interface {
 	PodName() string
 	PVCName() string
 	PVName() string
+	MemberOfCluster() MemberOfCluster
+	Ready() bool
 }
 
 // DeploymentOperator is the API implemented by the deployment operator.
@@ -112,21 +114,33 @@ func newDeploymentInfo(d Deployment) DeploymentInfo {
 	}
 }
 
+type MemberOfCluster string
+
+const (
+	IsMemberOfCluster    MemberOfCluster = "true"
+	IsNotMemberOfCluster MemberOfCluster = "false"
+	NeverMemberOfCluster MemberOfCluster = "never"
+)
+
 // MemberInfo contains detailed info of a specific member of the deployment
 type MemberInfo struct {
-	ID      string `json:"id"`
-	PodName string `json:"pod_name"`
-	PVCName string `json:"pvc_name"`
-	PVName  string `json:"pv_name"`
+	ID              string          `json:"id"`
+	PodName         string          `json:"pod_name"`
+	PVCName         string          `json:"pvc_name"`
+	PVName          string          `json:"pv_name"`
+	MemberOfCluster MemberOfCluster `json:"member_of_cluster"`
+	Ready           bool            `json:"ready"`
 }
 
 // newMemberInfo creates a MemberInfo for the given member
 func newMemberInfo(m Member) MemberInfo {
 	return MemberInfo{
-		ID:      m.ID(),
-		PodName: m.PodName(),
-		PVCName: m.PVCName(),
-		PVName:  m.PVName(),
+		ID:              m.ID(),
+		PodName:         m.PodName(),
+		PVCName:         m.PVCName(),
+		PVName:          m.PVName(),
+		MemberOfCluster: m.MemberOfCluster(),
+		Ready:           m.Ready(),
 	}
 }