Merged in master

Author: ewoutp

pkg/deployment/cluster_informer.go

@@ -26,8 +26,10 @@ import (
 	"context"
 	"time"
 
-	"github.com/arangodb/kube-arangodb/pkg/util/arangod"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/arangodb/kube-arangodb/pkg/util"
+	"github.com/arangodb/kube-arangodb/pkg/util/arangod"
 )
 
 // listenForClusterEvents keep listening for changes entered in the UI of the cluster.
@@ -91,10 +93,10 @@ func (d *Deployment) inspectCluster(ctx context.Context) error {
 		return maskAny(err)
 	}
 	if coordinatorsChanged {
-		current.Spec.Coordinators.Count = req.GetCoordinators()
+		current.Spec.Coordinators.Count = util.NewInt(req.GetCoordinators())
 	}
 	if dbserversChanged {
-		current.Spec.DBServers.Count = req.GetDBServers()
+		current.Spec.DBServers.Count = util.NewInt(req.GetDBServers())
 	}
 	if err := d.updateCRSpec(current.Spec); err != nil {
 		log.Warn().Err(err).Msg("Failed to update current deployment")

pkg/deployment/cluster_updater.go

@@ -36,8 +36,8 @@ func (d *Deployment) updateClusterServerCount(ctx context.Context) error {
 		return maskAny(err)
 	}
 	spec := d.apiObject.Spec
-	coordinatorCount := spec.Coordinators.Count
-	dbserverCount := spec.DBServers.Count
+	coordinatorCount := spec.Coordinators.GetCount()
+	dbserverCount := spec.DBServers.GetCount()
 	if err := arangod.SetNumberOfServers(ctx, c.Connection(), coordinatorCount, dbserverCount); err != nil {
 		log.Debug().Err(err).Msg("Failed to set number of servers")
 		return maskAny(err)

pkg/deployment/deployment.go

@@ -122,7 +122,7 @@ func New(config Config, deps Dependencies, apiObject *api.ArangoDeployment) (*De
 
 	go d.run()
 	go d.listenForPodEvents()
-	if apiObject.Spec.Mode == api.DeploymentModeCluster {
+	if apiObject.Spec.GetMode() == api.DeploymentModeCluster {
 		go d.listenForClusterEvents(d.stopCh)
 	}
 
@@ -293,7 +293,7 @@ func (d *Deployment) handleArangoDeploymentUpdatedEvent(event *deploymentEvent)
 	}
 
 	// Notify cluster of desired server count
-	if d.apiObject.Spec.Mode == api.DeploymentModeCluster {
+	if d.apiObject.Spec.GetMode() == api.DeploymentModeCluster {
 		ctx := context.Background()
 		if err := d.updateClusterServerCount(ctx); err != nil {
 			log.Error().Err(err).Msg("Failed to update desired server count in cluster")