refactor deployment redady into its own function and update instascale ready status

Signed-off-by: Kevin <[email protected]>

Author: KPostOffice

api/v1alpha1/instascale_types.go

@@ -34,8 +34,10 @@ type InstaScaleSpec struct {
 
 // InstaScaleStatus defines the observed state of InstaScale
 type InstaScaleStatus struct {
-	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
+
+	// +kubebuilder:default=false
+	Ready bool `json:"ready"`
 }
 
 //+kubebuilder:object:root=true

config/crd/bases/codeflare.codeflare.dev_instascales.yaml

@@ -48,6 +48,12 @@ spec:
             type: object
           status:
             description: InstaScaleStatus defines the observed state of InstaScale
+            properties:
+              ready:
+                default: false
+                type: boolean
+            required:
+            - ready
             type: object
         type: object
     served: true

controllers/instascale_controller.go

@@ -25,6 +25,7 @@ import (
 	authv1 "k8s.io/api/rbac/v1"
 	apierrs "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -33,6 +34,7 @@ import (
 	mf "github.com/manifestival/manifestival"
 	codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/api/v1alpha1"
 	"github.com/project-codeflare/codeflare-operator/controllers/config"
+	"github.com/project-codeflare/codeflare-operator/controllers/util"
 )
 
 // InstaScaleReconciler reconciles a InstaScale object
@@ -155,9 +157,29 @@ func (r *InstaScaleReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		return ctrl.Result{}, err
 	}
 
+	err = updateInstascaleReadyStatus(ctx, r, req, instascaleCustomResource)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+	err = r.Client.Status().Update(context.Background(), instascaleCustomResource)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+
 	return ctrl.Result{}, nil
 }
 
+func updateInstascaleReadyStatus(ctx context.Context, r *InstaScaleReconciler, req ctrl.Request, instascaleCustomResource *codeflarev1alpha1.InstaScale) error {
+	deployment := &appsv1.Deployment{}
+	err := r.Get(ctx, types.NamespacedName{Name: fmt.Sprintf("instascale-%s", req.Name), Namespace: req.Namespace}, deployment)
+	if err != nil {
+		return err
+	}
+	r.Log.Info("Checking if deployment is ready.")
+	instascaleCustomResource.Status.Ready = util.IsDeploymentReady(deployment)
+	return nil
+}
+
 // SetupWithManager sets up the controller with the Manager.
 func (r *InstaScaleReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).

controllers/mcad_controller.go

@@ -23,6 +23,7 @@ import (
 	"github.com/go-logr/logr"
 	mf "github.com/manifestival/manifestival"
 	"github.com/project-codeflare/codeflare-operator/controllers/config"
+	"github.com/project-codeflare/codeflare-operator/controllers/util"
 
 	codeflarev1alpha1 "github.com/project-codeflare/codeflare-operator/api/v1alpha1"
 	appsv1 "k8s.io/api/apps/v1"
@@ -189,7 +190,7 @@ func (r *MCADReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 		return ctrl.Result{}, err
 	}
 
-	err = updateReadyStatus(ctx, r, req, mcadCustomResource)
+	err = updateMCADReadyStatus(ctx, r, req, mcadCustomResource)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
@@ -201,23 +202,14 @@ func (r *MCADReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 	return ctrl.Result{}, nil
 }
 
-func updateReadyStatus(ctx context.Context, r *MCADReconciler, req ctrl.Request, mcadCustomResource *codeflarev1alpha1.MCAD) error {
+func updateMCADReadyStatus(ctx context.Context, r *MCADReconciler, req ctrl.Request, mcadCustomResource *codeflarev1alpha1.MCAD) error {
 	deployment := &appsv1.Deployment{}
 	err := r.Get(ctx, types.NamespacedName{Name: fmt.Sprintf("mcad-controller-%s", req.Name), Namespace: req.Namespace}, deployment)
 	if err != nil {
 		return err
 	}
-	r.Log.Info("Checking if deployment is ready.")
-	isDeploymentReady := false
-	for _, condition := range deployment.Status.Conditions {
-		r.Log.Info(fmt.Sprintf("%v: %v", condition.Type, condition.Status))
-		if condition.Type == appsv1.DeploymentAvailable && condition.Status == corev1.ConditionTrue {
-			isDeploymentReady = true
-			r.Log.Info("Deployment ready")
-			break
-		}
-	}
-	mcadCustomResource.Status.Ready = isDeploymentReady
+	r.Log.Info("Checking if MCAD deployment is ready.")
+	mcadCustomResource.Status.Ready = util.IsDeploymentReady(deployment)
 	return nil
 }
 

controllers/util/util.go

@@ -172,3 +172,12 @@ func ClusterRoleBindingsAreEqual(crb1 rbacv1.ClusterRoleBinding, crb2 rbacv1.Clu
 	}
 	return true
 }
+
+func IsDeploymentReady(deployment *appsv1.Deployment) bool {
+	for _, condition := range deployment.Status.Conditions {
+		if condition.Type == appsv1.DeploymentAvailable && condition.Status == corev1.ConditionTrue {
+			return true
+		}
+	}
+	return false
+}