[Feature] [ACS] Unify client handler (#987)

Author: ajanikow

pkg/deployment/acs/acs.community.go

@@ -43,10 +43,31 @@ type acs struct {
 	cache inspectorInterface.Inspector
 }
 
+func (a acs) ForEachHealthyCluster(f func(item sutil.ACSItem) error) error {
+	return f(a)
+}
+
+func (a acs) CurrentClusterCache() inspectorInterface.Inspector {
+	return a.cache
+}
+
+func (a acs) ClusterCache(uid types.UID) (inspectorInterface.Inspector, bool) {
+	c, ok := a.Cluster(uid)
+	if ok {
+		return c.Cache(), true
+	}
+
+	return nil, false
+}
+
 func (a acs) UID() types.UID {
 	return a.main
 }
 
+func (a acs) Ready() bool {
+	return true
+}
+
 func (a acs) Cache() inspectorInterface.Inspector {
 	return a.cache
 }

pkg/deployment/acs/sutil/interfaces.go

@@ -29,17 +29,26 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 )
 
+type ACSGetter interface {
+	ACS() ACS
+}
+
 type ACS interface {
 	ACSItem
 
 	Inspect(ctx context.Context, deployment *api.ArangoDeployment, client kclient.Client, cachedStatus inspectorInterface.Inspector) error
 
 	Cluster(uid types.UID) (ACSItem, bool)
+	CurrentClusterCache() inspectorInterface.Inspector
+	ClusterCache(uid types.UID) (inspectorInterface.Inspector, bool)
+
+	ForEachHealthyCluster(f func(item ACSItem) error) error
 
 	RemoteClusters() []types.UID
 }
 
 type ACSItem interface {
 	UID() types.UID
 	Cache() inspectorInterface.Inspector
+	Ready() bool
 }

pkg/deployment/context_impl.go

@@ -58,6 +58,7 @@ import (
 	backupApi "github.com/arangodb/kube-arangodb/pkg/apis/backup/v1"
 	api "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1"
 	"github.com/arangodb/kube-arangodb/pkg/apis/shared"
+	"github.com/arangodb/kube-arangodb/pkg/deployment/acs/sutil"
 	"github.com/arangodb/kube-arangodb/pkg/deployment/reconciler"
 	"github.com/arangodb/kube-arangodb/pkg/deployment/resources"
 	"github.com/arangodb/kube-arangodb/pkg/util/k8sutil"
@@ -567,20 +568,20 @@ func (d *Deployment) GetAgencyData(ctx context.Context, i interface{}, keyParts
 	return err
 }
 
-func (d *Deployment) RenderPodForMember(ctx context.Context, cachedStatus inspectorInterface.Inspector, spec api.DeploymentSpec, status api.DeploymentStatus, memberID string, imageInfo api.ImageInfo) (*core.Pod, error) {
-	return d.resources.RenderPodForMember(ctx, cachedStatus, spec, status, memberID, imageInfo)
+func (d *Deployment) RenderPodForMember(ctx context.Context, acs sutil.ACS, spec api.DeploymentSpec, status api.DeploymentStatus, memberID string, imageInfo api.ImageInfo) (*core.Pod, error) {
+	return d.resources.RenderPodForMember(ctx, acs, spec, status, memberID, imageInfo)
 }
 
-func (d *Deployment) RenderPodForMemberFromCurrent(ctx context.Context, cachedStatus inspectorInterface.Inspector, memberID string) (*core.Pod, error) {
-	return d.resources.RenderPodForMemberFromCurrent(ctx, cachedStatus, memberID)
+func (d *Deployment) RenderPodForMemberFromCurrent(ctx context.Context, acs sutil.ACS, memberID string) (*core.Pod, error) {
+	return d.resources.RenderPodForMemberFromCurrent(ctx, acs, memberID)
 }
 
-func (d *Deployment) RenderPodTemplateForMember(ctx context.Context, cachedStatus inspectorInterface.Inspector, spec api.DeploymentSpec, status api.DeploymentStatus, memberID string, imageInfo api.ImageInfo) (*core.PodTemplateSpec, error) {
-	return d.resources.RenderPodTemplateForMember(ctx, cachedStatus, spec, status, memberID, imageInfo)
+func (d *Deployment) RenderPodTemplateForMember(ctx context.Context, acs sutil.ACS, spec api.DeploymentSpec, status api.DeploymentStatus, memberID string, imageInfo api.ImageInfo) (*core.PodTemplateSpec, error) {
+	return d.resources.RenderPodTemplateForMember(ctx, acs, spec, status, memberID, imageInfo)
 }
 
-func (d *Deployment) RenderPodTemplateForMemberFromCurrent(ctx context.Context, cachedStatus inspectorInterface.Inspector, memberID string) (*core.PodTemplateSpec, error) {
-	return d.resources.RenderPodTemplateForMemberFromCurrent(ctx, cachedStatus, memberID)
+func (d *Deployment) RenderPodTemplateForMemberFromCurrent(ctx context.Context, acs sutil.ACS, memberID string) (*core.PodTemplateSpec, error) {
+	return d.resources.RenderPodTemplateForMemberFromCurrent(ctx, acs, memberID)
 }
 
 func (d *Deployment) SelectImage(spec api.DeploymentSpec, status api.DeploymentStatus) (api.ImageInfo, bool) {
@@ -710,3 +711,7 @@ func (d *Deployment) GetStatusSnapshot() api.DeploymentStatus {
 
 	return *z
 }
+
+func (d *Deployment) ACS() sutil.ACS {
+	return d.acs
+}

pkg/deployment/deployment_inspector.go

@@ -182,7 +182,7 @@ func (d *Deployment) inspectDeploymentWithError(ctx context.Context, lastInterva
 	}
 
 	// Cleanup terminated pods on the beginning of loop
-	if x, err := d.resources.CleanupTerminatedPods(ctx, d.GetCachedStatus()); err != nil {
+	if x, err := d.resources.CleanupTerminatedPods(ctx); err != nil {
 		return minInspectionInterval, errors.Wrapf(err, "Pod cleanup failed")
 	} else {
 		nextInterval = nextInterval.ReduceTo(x)
@@ -346,7 +346,7 @@ func (d *Deployment) inspectDeploymentWithError(ctx context.Context, lastInterva
 	}
 
 	// At the end of the inspect, we cleanup terminated pods.
-	if x, err := d.resources.CleanupTerminatedPods(ctx, d.GetCachedStatus()); err != nil {
+	if x, err := d.resources.CleanupTerminatedPods(ctx); err != nil {
 		return minInspectionInterval, errors.Wrapf(err, "Pod cleanup failed")
 	} else {
 		nextInterval = nextInterval.ReduceTo(x)

pkg/deployment/deployment_run_test.go

@@ -179,7 +179,7 @@ func runTestCase(t *testing.T, testCase testCaseStruct) {
 				image, ok := d.resources.SelectImage(d.apiObject.Spec, d.status.last)
 				require.True(t, ok)
 
-				template, err := d.resources.RenderPodTemplateForMember(context.Background(), d.GetCachedStatus(), d.apiObject.Spec, d.status.last, m.ID, image)
+				template, err := d.resources.RenderPodTemplateForMember(context.Background(), d.ACS(), d.apiObject.Spec, d.status.last, m.ID, image)
 				if err != nil {
 					return err
 				}

pkg/deployment/deployment_suite_test.go

@@ -43,6 +43,7 @@ import (
 
 	api "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1"
 	"github.com/arangodb/kube-arangodb/pkg/apis/shared"
+	"github.com/arangodb/kube-arangodb/pkg/deployment/acs"
 	"github.com/arangodb/kube-arangodb/pkg/deployment/resources"
 	"github.com/arangodb/kube-arangodb/pkg/deployment/resources/inspector"
 	arangofake "github.com/arangodb/kube-arangodb/pkg/generated/clientset/versioned/fake"
@@ -490,6 +491,7 @@ func createTestDeployment(t *testing.T, config Config, arangoDeployment *api.Ara
 		currentState: inspector.NewInspector(throttle.NewAlwaysThrottleComponents(), deps.Client, arangoDeployment.GetNamespace(), arangoDeployment.GetName()),
 	}
 	d.clientCache = client.NewClientCache(d, conn.NewFactory(d.getAuth, d.getConnConfig))
+	d.acs = acs.NewACS("", d.currentState)
 
 	require.NoError(t, d.currentState.Refresh(context.Background()))
 

pkg/deployment/reconcile/action.go

@@ -30,6 +30,11 @@ import (
 
 	api "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1"
 	"github.com/arangodb/kube-arangodb/pkg/util/k8sutil/inspector/throttle"
+	"k8s.io/apimachinery/pkg/types"
+)
+
+const (
+	DefaultStartFailureGracePeriod = 10 * time.Second
 )
 
 func GetAllActions() []api.ActionType {
@@ -82,12 +87,12 @@ type ActionReloadCachedStatus interface {
 	Action
 
 	// ReloadComponents return cache components to be reloaded
-	ReloadComponents() []throttle.Component
+	ReloadComponents() (types.UID, []throttle.Component)
 }
 
-func getActionReloadCachedStatus(a Action) []throttle.Component {
+func getActionReloadCachedStatus(a Action) (types.UID, []throttle.Component) {
 	if c, ok := a.(ActionReloadCachedStatus); !ok {
-		return nil
+		return "", nil
 	} else {
 		return c.ReloadComponents()
 	}
@@ -127,7 +132,7 @@ func (a actionStartFailureGracePeriod) StartFailureGracePeriod() time.Duration {
 
 func getStartFailureGracePeriod(a Action) time.Duration {
 	if c, ok := a.(ActionStartFailureGracePeriod); !ok {
-		return 0
+		return DefaultStartFailureGracePeriod
 	} else {
 		return c.StartFailureGracePeriod()
 	}

pkg/deployment/reconcile/action_arango_member_update_pod_spec.go

@@ -68,7 +68,7 @@ func (a *actionArangoMemberUpdatePodSpec) Start(ctx context.Context) (bool, erro
 		return true, nil
 	}
 
-	member, ok := a.actionCtx.GetCachedStatus().ArangoMember().V1().GetSimple(m.ArangoMemberName(a.actionCtx.GetName(), a.action.Group))
+	member, ok := a.actionCtx.ACS().CurrentClusterCache().ArangoMember().V1().GetSimple(m.ArangoMemberName(a.actionCtx.GetName(), a.action.Group))
 	if !ok {
 		err := errors.Newf("ArangoMember not found")
 		log.Error().Err(err).Msg("ArangoMember not found")
@@ -102,7 +102,7 @@ func (a *actionArangoMemberUpdatePodSpec) Start(ctx context.Context) (bool, erro
 		imageInfo = *m.Image
 	}
 
-	renderedPod, err := a.actionCtx.RenderPodTemplateForMember(ctx, a.actionCtx.GetCachedStatus(), spec, status, a.action.MemberID, imageInfo)
+	renderedPod, err := a.actionCtx.RenderPodTemplateForMember(ctx, a.actionCtx.ACS(), spec, status, a.action.MemberID, imageInfo)
 	if err != nil {
 		log.Err(err).Msg("Error while rendering pod")
 		return false, err

pkg/deployment/reconcile/action_arango_member_update_pod_status.go

@@ -67,7 +67,7 @@ func (a *actionArangoMemberUpdatePodStatus) Start(ctx context.Context) (bool, er
 		return true, nil
 	}
 
-	member, ok := a.actionCtx.GetCachedStatus().ArangoMember().V1().GetSimple(m.ArangoMemberName(a.actionCtx.GetName(), a.action.Group))
+	member, ok := a.actionCtx.ACS().CurrentClusterCache().ArangoMember().V1().GetSimple(m.ArangoMemberName(a.actionCtx.GetName(), a.action.Group))
 	if !ok {
 		err := errors.Newf("ArangoMember not found")
 		log.Error().Err(err).Msg("ArangoMember not found")

pkg/deployment/reconcile/action_bootstrap_set_password.go

@@ -138,7 +138,7 @@ func (a actionBootstrapSetPassword) setUserPassword(ctx context.Context, user, s
 }
 
 func (a actionBootstrapSetPassword) ensureUserPasswordSecret(ctx context.Context, user, secret string) (string, error) {
-	if auth, ok := a.actionCtx.GetCachedStatus().Secret().V1().GetSimple(secret); !ok {
+	if auth, ok := a.actionCtx.ACS().CurrentClusterCache().Secret().V1().GetSimple(secret); !ok {
 		// Create new one
 		tokenData := make([]byte, 32)
 		if _, err := rand.Read(tokenData); err != nil {