code-refactoring: add status reconciliation to ArgoCDReconciler

controllers/argocd/appcontroller/status.go

@@ -0,0 +1,32 @@
+package appcontroller
+
+import (
+	"context"
+
+	"github.com/pkg/errors"
+	"k8s.io/client-go/util/retry"
+)
+
+// reconcileStatus will ensure that the app-controller status is updated for the given ArgoCD instance
+func (acr *AppControllerReconciler) ReconcileStatus() error {
+
+	// TO DO
+
+	return acr.updateInstanceStatus()
+}
+
+func (acr *AppControllerReconciler) updateInstanceStatus() error {
+	err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		if err := acr.Client.Status().Update(context.TODO(), acr.Instance); err != nil {
+			return errors.Wrap(err, "UpdateInstanceStatus: failed to update instance status")
+		}
+		return nil
+	})
+
+	if err != nil {
+		// May be conflict if max retries were hit, or may be something unrelated
+		// like permissions or a network error
+		return err
+	}
+	return nil
+}

controllers/argocd/applicationset/status.go

@@ -0,0 +1,32 @@
+package applicationset
+
+import (
+	"context"
+
+	"github.com/pkg/errors"
+	"k8s.io/client-go/util/retry"
+)
+
+// reconcileStatus will ensure that the appset controller status is updated for the given ArgoCD instance
+func (asr *ApplicationSetReconciler) ReconcileStatus() error {
+
+	// TO DO
+
+	return asr.updateInstanceStatus()
+}
+
+func (asr *ApplicationSetReconciler) updateInstanceStatus() error {
+	err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		if err := asr.Client.Status().Update(context.TODO(), asr.Instance); err != nil {
+			return errors.Wrap(err, "UpdateInstanceStatus: failed to update instance status")
+		}
+		return nil
+	})
+
+	if err != nil {
+		// May be conflict if max retries were hit, or may be something unrelated
+		// like permissions or a network error
+		return err
+	}
+	return nil
+}

controllers/argocd/argocd_controller.go

@@ -548,6 +548,10 @@ func (r *ArgoCDReconciler) reconcileControllers() error {
 		r.Logger.Error(err, "failed to reconcile SSO controller")
 	}
 
+	if err := r.reconcileStatus(); err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -610,7 +614,7 @@ func (r *ArgoCDReconciler) InitializeControllerReconcilers() {
 	}
 
 	ssoController := &sso.SSOReconciler{
-		Client:   &r.Client,
+		Client:   r.Client,
 		Scheme:   r.Scheme,
 		Instance: r.Instance,
 	}

controllers/argocd/notifications/status.go

@@ -0,0 +1,32 @@
+package notifications
+
+import (
+	"context"
+
+	"github.com/pkg/errors"
+	"k8s.io/client-go/util/retry"
+)
+
+// reconcileStatus will ensure that the notifications controller status is updated for the given ArgoCD instance
+func (nr *NotificationsReconciler) ReconcileStatus() error {
+
+	// TO DO
+
+	return nr.updateInstanceStatus()
+}
+
+func (nr *NotificationsReconciler) updateInstanceStatus() error {
+	err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		if err := nr.Client.Status().Update(context.TODO(), nr.Instance); err != nil {
+			return errors.Wrap(err, "UpdateInstanceStatus: failed to update instance status")
+		}
+		return nil
+	})
+
+	if err != nil {
+		// May be conflict if max retries were hit, or may be something unrelated
+		// like permissions or a network error
+		return err
+	}
+	return nil
+}

controllers/argocd/redis/status.go

@@ -0,0 +1,32 @@
+package redis
+
+import (
+	"context"
+
+	"github.com/pkg/errors"
+	"k8s.io/client-go/util/retry"
+)
+
+// reconcileStatusRedis will ensure that the Redis status is updated for the given ArgoCD instance
+func (rr *RedisReconciler) ReconcileStatus() error {
+
+	// TO DO
+
+	return rr.updateInstanceStatus()
+}
+
+func (rr *RedisReconciler) updateInstanceStatus() error {
+	err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		if err := rr.Client.Status().Update(context.TODO(), rr.Instance); err != nil {
+			return errors.Wrap(err, "UpdateInstanceStatus: failed to update instance status")
+		}
+		return nil
+	})
+
+	if err != nil {
+		// May be conflict if max retries were hit, or may be something unrelated
+		// like permissions or a network error
+		return err
+	}
+	return nil
+}

controllers/argocd/reposerver/status.go

@@ -0,0 +1,32 @@
+package reposerver
+
+import (
+	"context"
+
+	"github.com/pkg/errors"
+	"k8s.io/client-go/util/retry"
+)
+
+// reconcileStatus will ensure that the Repo-server status is updated for the given ArgoCD instance
+func (rsr *RepoServerReconciler) ReconcileStatus() error {
+
+	// TO DO
+
+	return rsr.updateInstanceStatus()
+}
+
+func (rsr *RepoServerReconciler) updateInstanceStatus() error {
+	err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		if err := rsr.Client.Status().Update(context.TODO(), rsr.Instance); err != nil {
+			return errors.Wrap(err, "UpdateInstanceStatus: failed to update instance status")
+		}
+		return nil
+	})
+
+	if err != nil {
+		// May be conflict if max retries were hit, or may be something unrelated
+		// like permissions or a network error
+		return err
+	}
+	return nil
+}

controllers/argocd/server/status.go

@@ -0,0 +1,32 @@
+package server
+
+import (
+	"context"
+
+	"github.com/pkg/errors"
+	"k8s.io/client-go/util/retry"
+)
+
+// reconcileStatus will ensure that the server status is updated for the given ArgoCD instance
+func (sr *ServerReconciler) ReconcileStatus() error {
+
+	// TO DO
+
+	return sr.updateInstanceStatus()
+}
+
+func (sr *ServerReconciler) updateInstanceStatus() error {
+	err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		if err := sr.Client.Status().Update(context.TODO(), sr.Instance); err != nil {
+			return errors.Wrap(err, "UpdateInstanceStatus: failed to update instance status")
+		}
+		return nil
+	})
+
+	if err != nil {
+		// May be conflict if max retries were hit, or may be something unrelated
+		// like permissions or a network error
+		return err
+	}
+	return nil
+}

controllers/argocd/sso/sso.go

@@ -9,7 +9,7 @@ import (
 )
 
 type SSOReconciler struct {
-	Client   *client.Client
+	Client   client.Client
 	Scheme   *runtime.Scheme
 	Instance *argoproj.ArgoCD
 	Logger   logr.Logger

controllers/argocd/sso/status.go

@@ -0,0 +1,32 @@
+package sso
+
+import (
+	"context"
+
+	"github.com/pkg/errors"
+	"k8s.io/client-go/util/retry"
+)
+
+// reconcileStatus will ensure that the sso status is updated for the given ArgoCD instance
+func (sr *SSOReconciler) ReconcileStatus() error {
+
+	// TO DO
+
+	return sr.updateInstanceStatus()
+}
+
+func (sr *SSOReconciler) updateInstanceStatus() error {
+	err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		if err := sr.Client.Status().Update(context.TODO(), sr.Instance); err != nil {
+			return errors.Wrap(err, "UpdateInstanceStatus: failed to update instance status")
+		}
+		return nil
+	})
+
+	if err != nil {
+		// May be conflict if max retries were hit, or may be something unrelated
+		// like permissions or a network error
+		return err
+	}
+	return nil
+}

controllers/argocd/status.go

@@ -28,8 +28,61 @@ import (
 
 	argoproj "github.com/argoproj-labs/argocd-operator/api/v1beta1"
 	"github.com/argoproj-labs/argocd-operator/pkg/argoutil"
+	"github.com/argoproj-labs/argocd-operator/pkg/util"
 )
 
+// reconcileStatus will ensure that all of the Status properties are updated for the given ArgoCD.
+func (r *ArgoCDReconciler) reconcileStatus() error {
+	var statusErr util.MultiError
+
+	if err := r.AppController.ReconcileStatus(); err != nil {
+		r.Logger.Error(err, "reconcileStatus")
+		statusErr.Append(err)
+	}
+
+	if err := r.ServerController.ReconcileStatus(); err != nil {
+		r.Logger.Error(err, "reconcileStatus")
+		statusErr.Append(err)
+	}
+
+	if err := r.RedisController.ReconcileStatus(); err != nil {
+		r.Logger.Error(err, "reconcileStatus")
+		statusErr.Append(err)
+	}
+
+	if err := r.ReposerverController.ReconcileStatus(); err != nil {
+		r.Logger.Error(err, "reconcileStatus")
+		statusErr.Append(err)
+	}
+
+	if err := r.AppsetController.ReconcileStatus(); err != nil {
+		r.Logger.Error(err, "reconcileStatus")
+		statusErr.Append(err)
+	}
+
+	if err := r.NotificationsController.ReconcileStatus(); err != nil {
+		r.Logger.Error(err, "reconcileStatus")
+		statusErr.Append(err)
+	}
+
+	if err := r.SSOController.ReconcileStatus(); err != nil {
+		r.Logger.Error(err, "reconcileStatus")
+		statusErr.Append(err)
+	}
+
+	// TO DO
+
+	// if err := r.reconcileStatusHost(cr); err != nil {
+	// 	return err
+	// }
+
+	// if err := r.reconcileStatusPhase(cr); err != nil {
+	// 	return err
+	// }
+
+	return statusErr.ErrOrNil()
+}
+
 // reconcileStatus will ensure that all of the Status properties are updated for the given ArgoCD.
 func (r *ReconcileArgoCD) reconcileStatus(cr *argoproj.ArgoCD) error {
 	if err := r.reconcileStatusApplicationController(cr); err != nil {