Added more instance running states and updated Ready condition to consider these.

Author: joshlreese

api/v1alpha/instance_types.go

@@ -384,6 +384,9 @@ const (
 	// InstanceReady indicates that the instance is ready
 	InstanceReady = "Ready"
 
+	// InstanceRunning indicates that the instance is running
+	InstanceRunning = "Running"
+
 	// InstanceProgrammed indicates that the instance has been programmed
 	InstanceProgrammed = "Programmed"
 )
@@ -395,6 +398,18 @@ const (
 	// InstanceReadyReasonRunning indicates that the instance is running
 	InstanceReadyReasonRunning = "Running"
 
+	// InstanceRunningReasonStopped indicates that the instance is stopped
+	InstanceRunningReasonStopped = "Stopped"
+
+	// InstanceRunningReasonStarting indicates that the instance is starting
+	InstanceRunningReasonStarting = "Starting"
+
+	// InstanceRunningReasonStopping indicates that the instance is stopping
+	InstanceRunningReasonStopping = "Stopping"
+
+	// InstanceRunningReasonRunning indicates that the instance is running
+	InstanceRunningReasonRunning = "Running"
+
 	// InstanceProgrammedReasonPendingProgramming indicates that the instance has not been programmed
 	InstanceProgrammedReasonPendingProgramming = "PendingProgramming"
 

internal/controller/instance_controller.go

@@ -47,10 +47,6 @@ func (r *InstanceReconciler) Reconcile(ctx context.Context, req mcreconcile.Requ
 		return ctrl.Result{}, err
 	}
 
-	if !instance.DeletionTimestamp.IsZero() {
-		return ctrl.Result{}, nil
-	}
-
 	logger.Info("reconciling instance")
 	defer logger.Info("reconcile complete")
 
@@ -94,7 +90,6 @@ func (r *InstanceReconciler) Reconcile(ctx context.Context, req mcreconcile.Requ
 			reason = condition.Reason
 		}
 
-		logger.Info("updating instance status", "instance", instance.Name)
 		if _, err := controllerutil.CreateOrPatch(ctx, cl.GetClient(), &instance, func() error {
 			apimeta.SetStatusCondition(&instance.Status.Conditions, metav1.Condition{
 				Type:               computev1alpha.InstanceReady,
@@ -112,6 +107,33 @@ func (r *InstanceReconciler) Reconcile(ctx context.Context, req mcreconcile.Requ
 
 	logger.Info("instance is programmed", "instance", instance.Name)
 
+	if condition := apimeta.FindStatusCondition(instance.Status.Conditions, computev1alpha.InstanceRunning); condition.Status != metav1.ConditionTrue {
+		logger.Info("instance is not running", "instance", instance.Name)
+		message := "Instance is not running"
+		if condition.Status != metav1.ConditionUnknown {
+			message = condition.Message
+		}
+
+		reason := "Pending"
+		if condition.Reason != "Pending" {
+			reason = condition.Reason
+		}
+
+		if _, err := controllerutil.CreateOrPatch(ctx, cl.GetClient(), &instance, func() error {
+			apimeta.SetStatusCondition(&instance.Status.Conditions, metav1.Condition{
+				Type:               computev1alpha.InstanceReady,
+				Status:             metav1.ConditionFalse,
+				Reason:             reason,
+				Message:            message,
+				ObservedGeneration: instance.Generation,
+			})
+			return nil
+		}); err != nil {
+			return ctrl.Result{}, fmt.Errorf("failed updating instance status: %w", err)
+		}
+		return ctrl.Result{}, nil
+	}
+
 	if _, err := controllerutil.CreateOrPatch(ctx, cl.GetClient(), &instance, func() error {
 		apimeta.SetStatusCondition(&instance.Status.Conditions, metav1.Condition{
 			Type:               computev1alpha.InstanceReady,

internal/controller/workloaddeployment_controller.go

@@ -138,6 +138,8 @@ func (r *WorkloadDeploymentReconciler) Reconcile(ctx context.Context, req mcreco
 		}
 	}
 
+	// TODO(jreese) update deployment status conditions
+
 	return ctrl.Result{}, nil
 }