[Feature] Add ClusterDomain config (#683)

Author: ajanikow

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Change Log
 
 ## [master](https://github.com/arangodb/kube-arangodb/tree/master) (N/A)
+- Add support for spec.ClusterDomain to be able to use FQDN in ArangoDB cluster communication
 
 ## [1.1.3](https://github.com/arangodb/kube-arangodb/tree/1.1.3) (2020-12-16)
 - Add v2alpha1 API for ArangoDeployment and ArangoDeploymentReplication

pkg/apis/deployment/v1/deployment_spec.go

@@ -116,6 +116,8 @@ type DeploymentSpec struct {
 	Bootstrap BootstrapSpec `json:"bootstrap,omitempty"`
 
 	Timeouts *Timeouts `json:"timeouts,omitempty"`
+
+	ClusterDomain *string `json:"ClusterDomain,omitempty"`
 }
 
 // GetRestoreFrom returns the restore from string or empty string if not set

pkg/apis/deployment/v1/member_status.go

@@ -71,6 +71,8 @@ type MemberStatus struct {
 	Image *ImageInfo `json:"image,omitempty"`
 	// Upgrade define if upgrade should be enforced during next execution
 	Upgrade bool `json:"upgrade,omitempty"`
+	// Endpoint definition how member should be reachable
+	Endpoint *string `json:"endpoint,omitempty"`
 }
 
 // Equal checks for equality
@@ -87,7 +89,8 @@ func (s MemberStatus) Equal(other MemberStatus) bool {
 		s.ArangoVersion == other.ArangoVersion &&
 		s.ImageID == other.ImageID &&
 		s.Image.Equal(other.Image) &&
-		s.Upgrade == other.Upgrade
+		s.Upgrade == other.Upgrade &&
+		util.CompareStringPointers(s.Endpoint, other.Endpoint)
 }
 
 // Age returns the duration since the creation timestamp of this member.
@@ -115,6 +118,14 @@ func (s *MemberStatus) RemoveTerminationsBefore(timestamp time.Time) int {
 	}
 }
 
+func (s *MemberStatus) GetEndpoint(defaultEndpoint string) string {
+	if s == nil || s.Endpoint == nil {
+		return defaultEndpoint
+	}
+
+	return *s.Endpoint
+}
+
 // RecentTerminationsSince returns the number of terminations since the given timestamp.
 func (s MemberStatus) RecentTerminationsSince(timestamp time.Time) int {
 	count := 0

pkg/apis/deployment/v1/zz_generated.deepcopy.go

@@ -116,6 +116,8 @@ type DeploymentSpec struct {
 	Bootstrap BootstrapSpec `json:"bootstrap,omitempty"`
 
 	Timeouts *Timeouts `json:"timeouts,omitempty"`
+
+	ClusterDomain *string `json:"ClusterDomain,omitempty"`
 }
 
 // GetRestoreFrom returns the restore from string or empty string if not set

pkg/apis/deployment/v2alpha1/deployment_spec.go

@@ -24,6 +24,7 @@ package v2alpha1
 
 import (
 	"github.com/arangodb/kube-arangodb/pkg/util/errors"
+
 	v1 "k8s.io/api/core/v1"
 )
 

pkg/apis/deployment/v2alpha1/external_access_type.go

@@ -71,6 +71,8 @@ type MemberStatus struct {
 	Image *ImageInfo `json:"image,omitempty"`
 	// Upgrade define if upgrade should be enforced during next execution
 	Upgrade bool `json:"upgrade,omitempty"`
+	// Endpoint definition how member should be reachable
+	Endpoint *string `json:"endpoint,omitempty"`
 }
 
 // Equal checks for equality
@@ -87,7 +89,8 @@ func (s MemberStatus) Equal(other MemberStatus) bool {
 		s.ArangoVersion == other.ArangoVersion &&
 		s.ImageID == other.ImageID &&
 		s.Image.Equal(other.Image) &&
-		s.Upgrade == other.Upgrade
+		s.Upgrade == other.Upgrade &&
+		util.CompareStringPointers(s.Endpoint, other.Endpoint)
 }
 
 // Age returns the duration since the creation timestamp of this member.
@@ -115,6 +118,14 @@ func (s *MemberStatus) RemoveTerminationsBefore(timestamp time.Time) int {
 	}
 }
 
+func (s *MemberStatus) GetEndpoint(defaultEndpoint string) string {
+	if s == nil || s.Endpoint == nil {
+		return defaultEndpoint
+	}
+
+	return *s.Endpoint
+}
+
 // RecentTerminationsSince returns the number of terminations since the given timestamp.
 func (s MemberStatus) RecentTerminationsSince(timestamp time.Time) int {
 	count := 0

pkg/apis/deployment/v2alpha1/member_status.go

@@ -24,7 +24,6 @@ package client
 
 import (
 	"context"
-	"fmt"
 	"net"
 	"strconv"
 	"sync"
@@ -49,19 +48,15 @@ type Cache interface {
 
 func NewClientCache(apiObjectGetter func() *api.ArangoDeployment, factory conn.Factory) Cache {
 	return &cache{
-		clients:         make(map[string]driver.Client),
 		apiObjectGetter: apiObjectGetter,
 		factory:         factory,
 	}
 }
 
 type cache struct {
 	mutex           sync.Mutex
-	clients         map[string]driver.Client
 	apiObjectGetter func() *api.ArangoDeployment
 
-	databaseClient driver.Client
-
 	factory conn.Factory
 }
 
@@ -75,18 +70,12 @@ func (cc *cache) extendHost(host string) string {
 }
 
 func (cc *cache) getClient(ctx context.Context, group api.ServerGroup, id string) (driver.Client, error) {
-	key := fmt.Sprintf("%d-%s", group, id)
-	c, found := cc.clients[key]
-	if found {
-		return c, nil
-	}
+	m, _, _ := cc.apiObjectGetter().Status.Members.ElementByID(id)
 
-	// Not found, create a new client
-	c, err := cc.factory.Client(cc.extendHost(k8sutil.CreatePodDNSName(cc.apiObjectGetter(), group.AsRole(), id)))
+	c, err := cc.factory.Client(cc.extendHost(m.GetEndpoint(k8sutil.CreatePodDNSName(cc.apiObjectGetter(), group.AsRole(), id))))
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}
-	cc.clients[key] = c
 	return c, nil
 }
 
@@ -99,7 +88,6 @@ func (cc *cache) get(ctx context.Context, group api.ServerGroup, id string) (dri
 	if _, err := client.Version(ctx); err == nil {
 		return client, nil
 	} else if driver.IsUnauthorized(err) {
-		delete(cc.clients, fmt.Sprintf("%d-%s", group, id))
 		return cc.getClient(ctx, group, id)
 	} else {
 		return client, nil
@@ -120,16 +108,10 @@ func (cc cache) GetAuth() conn.Auth {
 }
 
 func (cc *cache) getDatabaseClient() (driver.Client, error) {
-	if c := cc.databaseClient; c != nil {
-		return c, nil
-	}
-
-	// Not found, create a new client
 	c, err := cc.factory.Client(cc.extendHost(k8sutil.CreateDatabaseClientServiceDNSName(cc.apiObjectGetter())))
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}
-	cc.databaseClient = c
 	return c, nil
 }
 
@@ -142,7 +124,6 @@ func (cc *cache) getDatabase(ctx context.Context) (driver.Client, error) {
 	if _, err := client.Version(ctx); err == nil {
 		return client, nil
 	} else if driver.IsUnauthorized(err) {
-		cc.databaseClient = nil
 		return cc.getDatabaseClient()
 	} else {
 		return client, nil
@@ -162,7 +143,7 @@ func (cc *cache) getAgencyClient() (agency.Agency, error) {
 	// Not found, create a new client
 	var dnsNames []string
 	for _, m := range cc.apiObjectGetter().Status.Members.Agents {
-		dnsNames = append(dnsNames, cc.extendHost(k8sutil.CreatePodDNSName(cc.apiObjectGetter(), api.ServerGroupAgents.AsRole(), m.ID)))
+		dnsNames = append(dnsNames, cc.extendHost(m.GetEndpoint(k8sutil.CreatePodDNSName(cc.apiObjectGetter(), api.ServerGroupAgents.AsRole(), m.ID))))
 	}
 
 	if len(dnsNames) == 0 {

pkg/apis/deployment/v2alpha1/zz_generated.deepcopy.go

@@ -322,7 +322,7 @@ func (d *Deployment) GetSyncServerClient(ctx context.Context, group api.ServerGr
 	}
 
 	// Fetch server DNS name
-	dnsName := k8sutil.CreatePodDNSName(d.apiObject, group.AsRole(), id)
+	dnsName := k8sutil.CreatePodDNSNameWithDomain(d.apiObject, d.apiObject.Spec.ClusterDomain, group.AsRole(), id)
 
 	// Build client
 	port := k8sutil.ArangoSyncMasterPort