[Feature] Manage ArangoMember within ArangoDeployment

Makefile

@@ -249,7 +249,7 @@ update-generated:
 			"deepcopy" \
 			"github.com/arangodb/kube-arangodb/pkg/generated" \
 			"github.com/arangodb/kube-arangodb/pkg/apis" \
-			"shared:v1 deployment:v1/member deployment:v2alpha1/member" \
+			"shared:v1" \
 			--go-header-file "./tools/codegen/boilerplate.go.txt" \
 			$(VERIFYARGS)
 

chart/kube-arangodb-crd/templates/member.yaml

@@ -1,7 +1,7 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-    name: arangomembmers.database.arangodb.com
+    name: arangomembers.database.arangodb.com
     labels:
         app.kubernetes.io/name: {{ template "kube-arangodb-crd.name" . }}
         helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}

chart/kube-arangodb/crds/member.yaml

@@ -1,7 +1,7 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-    name: arangomembmers.database.arangodb.com
+    name: arangomembers.database.arangodb.com
 spec:
   group: database.arangodb.com
   names:

pkg/apis/deployment/definitions.go

@@ -27,6 +27,10 @@ const (
 	ArangoDeploymentResourceKind   = "ArangoDeployment"
 	ArangoDeploymentResourcePlural = "arangodeployments"
 
+	ArangoMemberCRDName        = ArangoMemberResourcePlural + "." + ArangoDeploymentGroupName
+	ArangoMemberResourceKind   = "ArangoMember"
+	ArangoMemberResourcePlural = "arangomembers"
+
 	ArangoDeploymentGroupName = "database.arangodb.com"
 )
 

pkg/apis/deployment/v1/arango_member.go

@@ -23,7 +23,7 @@
 package v1
 
 import (
-	"github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1/member"
+	"github.com/arangodb/kube-arangodb/pkg/apis/deployment"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -45,6 +45,20 @@ type ArangoMemberList struct {
 type ArangoMember struct {
 	meta.TypeMeta   `json:",inline"`
 	meta.ObjectMeta `json:"metadata,omitempty"`
-	Spec            member.Spec   `json:"spec,omitempty"`
-	Status          member.Status `json:"status,omitempty"`
+	Spec            ArangoMemberSpec   `json:"spec,omitempty"`
+	Status          ArangoMemberStatus `json:"status,omitempty"`
+}
+
+// AsOwner creates an OwnerReference for the given member
+func (a *ArangoMember) AsOwner() meta.OwnerReference {
+	trueVar := true
+	return meta.OwnerReference{
+		APIVersion: SchemeGroupVersion.String(),
+		Kind:       deployment.ArangoMemberResourceKind,
+		Name:       a.Name,
+		UID:        a.UID,
+		Controller: &trueVar,
+		// For now BlockOwnerDeletion does not work on OpenShift, so we leave it out.
+		//BlockOwnerDeletion: &trueVar,
+	}
 }

pkg/apis/deployment/v2alpha1/member/spec.go → pkg/apis/deployment/v1/arango_member_spec.go

@@ -20,11 +20,14 @@
 // Author Adam Janikowski
 //
 
-package member
+package v1
 
 import core "k8s.io/api/core/v1"
 
-type Spec struct {
+type ArangoMemberSpec struct {
+	Group ServerGroup `json:"group,omitempty"`
+	ID    string      `json:"id,omitempty"`
+
 	Template         *core.PodTemplate `json:"template,omitempty"`
 	TemplateChecksum string            `json:"templateChecksum,omitempty"`
 }

pkg/apis/deployment/v2alpha1/member/status.go → pkg/apis/deployment/v1/arango_member_status.go

@@ -20,7 +20,7 @@
 // Author Adam Janikowski
 //
 
-package member
+package v1
 
-type Status struct {
+type ArangoMemberStatus struct {
 }

pkg/apis/deployment/v1/member_status.go

@@ -26,6 +26,8 @@ import (
 	"reflect"
 	"time"
 
+	"github.com/arangodb/kube-arangodb/pkg/util/k8sutil"
+
 	"k8s.io/apimachinery/pkg/types"
 
 	driver "github.com/arangodb/go-driver"
@@ -155,3 +157,8 @@ func (s MemberStatus) IsNotReadySince(timestamp time.Time) bool {
 	// A
 	return s.CreatedAt.Time.Before(timestamp)
 }
+
+// ArangoMemberName create member name from given member
+func (s MemberStatus) ArangoMemberName(deploymentName string, group ServerGroup) string {
+	return k8sutil.CreatePodHostName(deploymentName, group.AsRole(), s.ID)
+}

pkg/apis/deployment/v1/register.go

@@ -50,6 +50,8 @@ func addKnownTypes(s *runtime.Scheme) error {
 	s.AddKnownTypes(SchemeGroupVersion,
 		&ArangoDeployment{},
 		&ArangoDeploymentList{},
+		&ArangoMember{},
+		&ArangoMemberList{},
 	)
 	metav1.AddToGroupVersion(s, SchemeGroupVersion)
 	return nil

pkg/apis/deployment/v1/server_group.go

@@ -22,10 +22,34 @@
 
 package v1
 
-import "time"
+import (
+	"encoding/json"
+	"time"
+)
 
 type ServerGroup int
 
+func (g *ServerGroup) UnmarshalJSON(bytes []byte) error {
+	if bytes == nil {
+		*g = ServerGroupUnknown
+		return nil
+	}
+
+	var s string
+
+	if err := json.Unmarshal(bytes, &s); err != nil {
+		return err
+	}
+
+	*g = ServerGroupFromRole(s)
+
+	return nil
+}
+
+func (g ServerGroup) MarshalJSON() ([]byte, error) {
+	return json.Marshal(g.AsRole())
+}
+
 const (
 	ServerGroupUnknown        ServerGroup = 0
 	ServerGroupSingle         ServerGroup = 1

pkg/apis/deployment/v2alpha1/arango_member.go

@@ -23,7 +23,6 @@
 package v2alpha1
 
 import (
-	"github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1/member"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -45,6 +44,6 @@ type ArangoMemberList struct {
 type ArangoMember struct {
 	meta.TypeMeta   `json:",inline"`
 	meta.ObjectMeta `json:"metadata,omitempty"`
-	Spec            member.Spec   `json:"spec,omitempty"`
-	Status          member.Status `json:"status,omitempty"`
+	Spec            ArangoMemberSpec   `json:"spec,omitempty"`
+	Status          ArangoMemberStatus `json:"status,omitempty"`
 }

pkg/apis/deployment/v1/member/spec.go → pkg/apis/deployment/v2alpha1/arango_member_spec.go

@@ -20,11 +20,14 @@
 // Author Adam Janikowski
 //
 
-package member
+package v2alpha1
 
 import core "k8s.io/api/core/v1"
 
-type Spec struct {
+type ArangoMemberSpec struct {
+	Group ServerGroup `json:"group,omitempty"`
+	ID    string      `json:"id,omitempty"`
+
 	Template         *core.PodTemplate `json:"template,omitempty"`
 	TemplateChecksum string            `json:"templateChecksum,omitempty"`
 }

pkg/apis/deployment/v1/member/status.go → pkg/apis/deployment/v2alpha1/arango_member_status.go

@@ -20,7 +20,7 @@
 // Author Adam Janikowski
 //
 
-package member
+package v2alpha1
 
-type Status struct {
+type ArangoMemberStatus struct {
 }