OAS-9904 Introduce ArangoDeployment Gateway Group

Author: jwierzbo

pkg/apis/shared/constants.go

@@ -25,7 +25,6 @@ const (
 ArangoPort = 8529
 ArangoSyncMasterPort = 8629
 ArangoSyncWorkerPort = 8729
-ArangoGatewayPort = 10000
 ArangoExporterPort = 9101
 
 ArangoExporterStatusEndpoint = "/_api/version"

pkg/deployment/pod/utils.go

@@ -43,7 +43,7 @@ func GenerateMemberEndpoint(services service.Inspector, apiObject meta.Object, s
 
 func GenerateMemberEndpointFromService(svc *core.Service, apiObject meta.Object, spec api.DeploymentSpec, group api.ServerGroup, member api.MemberStatus) (string, error) {
 switch group.Type() {
-case api.ServerGroupTypeArangoD:
+case api.ServerGroupTypeArangoD, api.ServerGroupGateways:
 switch method := spec.CommunicationMethod.Get(); method {
 case api.DeploymentCommunicationMethodDNS, api.DeploymentCommunicationMethodHeadlessDNS:
 return k8sutil.CreateServiceDNSNameWithDomain(svc, spec.ClusterDomain), nil

pkg/deployment/resources/pod_creator_gateway.go

@@ -90,7 +90,7 @@ func (a *ArangoGatewayContainer) GetName() string {
 }
 
 func (a *ArangoGatewayContainer) GetPorts() []core.ContainerPort {
-port := shared.ArangoGatewayPort
+port := shared.ArangoPort
 
 return []core.ContainerPort{
 {

pkg/deployment/resources/services.go

@@ -82,6 +82,10 @@ func (r *Resources) EnsureServices(ctx context.Context, cachedStatus inspectorIn
 defer metrics.SetDuration(inspectServicesDurationGauges.WithLabelValues(deploymentName), start)
 counterMetric := inspectedServicesCounters.WithLabelValues(deploymentName)
 
+if spec.IsGatewayEnabled() {
+role = api.ServerGroupGateways.AsRole()
+}
+
 // Fetch existing services
 svcs := cachedStatus.ServicesModInterface().V1()
 amInspector := cachedStatus.ArangoMember().V1()
@@ -130,7 +134,7 @@ func (r *Resources) EnsureServices(ctx context.Context, cachedStatus inspectorIn
 
 // Group Services
 for _, group := range api.AllServerGroups {
-if !group.Enabled(spec.GetMode()) {
+if !group.Enabled(spec.GetMode()) && !group.IsGateway() {
 continue
 }
 
@@ -189,11 +193,6 @@ func (r *Resources) EnsureServices(ctx context.Context, cachedStatus inspectorIn
 counterMetric.Inc()
 headlessPorts, headlessSelector := k8sutil.HeadlessServiceDetails(deploymentName)
 
-// todo
-/*	if spec.IsGatewayEnabled() {
-// set headlessSelector to point to gateway
-}*/
-
 if s, exists := cachedStatus.Service().V1().GetSimple(k8sutil.CreateHeadlessServiceName(deploymentName)); !exists {
 ctxChild, cancel := globals.GetGlobalTimeouts().Kubernetes().WithTimeout(ctx)
 defer cancel()
@@ -261,7 +260,6 @@ func (r *Resources) EnsureServices(ctx context.Context, cachedStatus inspectorIn
 return errors.WithStack(err)
 }
 
-//todo
 if r.context.IsSyncEnabled() {
 // External (and internal) Sync master service
 counterMetric.Inc()

pkg/util/k8sutil/util.go

@@ -44,7 +44,7 @@ const (
 LabelKeyArangoScheduled = "deployment.arangodb.com/scheduled"
 // LabelKeyArangoTopology is the key of the label used to store the ArangoDeployment topology ID in
 LabelKeyArangoTopology = "deployment.arangodb.com/topology"
-// LabelKeyArangoLeader is the key of the label used to store the current leader of a group instances.
+// LabelKeyArangoLeader is the key of the label used to store the current leader of a group instances. AF only.
 LabelKeyArangoLeader = "deployment.arangodb.com/leader"
 // LabelKeyArangoActive is the key of the label used to mark members as active.
 LabelKeyArangoActive = "deployment.arangodb.com/active"