Sync WorkloadDeployment replica and Available condition information in status.

Author: joshlreese

api/v1alpha/workloaddeployment_types.go

@@ -50,7 +50,7 @@ type WorkloadDeploymentStatus struct {
 	Replicas int32 `json:"replicas"`
 
 	// The number of instances created by a deployment and have the latest
-	// deployment generation settings applied.
+	// deployment template settings applied.
 	CurrentReplicas int32 `json:"currentReplicas"`
 
 	// The desired number of instances to be managed by a deployment.

config/crd/bases/compute.datumapis.com_workloaddeployments.yaml

@@ -1014,7 +1014,7 @@ spec:
               currentReplicas:
                 description: |-
                   The number of instances created by a deployment and have the latest
-                  deployment generation settings applied.
+                  deployment template settings applied.
                 format: int32
                 type: integer
               desiredReplicas:

internal/controller/workloaddeployment_controller.go

@@ -138,29 +138,63 @@ func (r *WorkloadDeploymentReconciler) Reconcile(ctx context.Context, req mcreco
 	// their gates removed.
 	logger.Info("removing scheduling gates from instances")
 
+	replicas := len(instances.Items)
+	currentReplicas := 0
+	desiredReplicas := deployment.Spec.ScaleSettings.MinReplicas
+	readyReplicas := 0
 	for _, instance := range instances.Items {
-		if len(instance.Spec.Controller.SchedulingGates) == 0 {
-			continue
+		if len(instance.Spec.Controller.SchedulingGates) > 0 {
+			newGates := slices.DeleteFunc(instance.Spec.Controller.SchedulingGates, func(gate computev1alpha.SchedulingGate) bool {
+				return gate.Name == instancecontrol.NetworkSchedulingGate.String()
+			})
+
+			if len(newGates) == len(instance.Spec.Controller.SchedulingGates) {
+				// Already been removed, there must be other gates.
+				continue
+			}
+
+			if _, err := controllerutil.CreateOrPatch(ctx, cl.GetClient(), &instance, func() error {
+				instance.Spec.Controller.SchedulingGates = newGates
+				return nil
+			}); err != nil {
+				return ctrl.Result{}, fmt.Errorf("failed updating instance: %w", err)
+			}
 		}
 
-		newGates := slices.DeleteFunc(instance.Spec.Controller.SchedulingGates, func(gate computev1alpha.SchedulingGate) bool {
-			return gate.Name == instancecontrol.NetworkSchedulingGate.String()
-		})
+		if apimeta.IsStatusConditionTrue(instance.Status.Conditions, computev1alpha.InstanceProgrammed) {
+			if instance.Status.Controller.ObservedTemplateHash == instancecontrol.ComputeHash(deployment.Spec.Template) {
+				currentReplicas++
+			}
+		}
 
-		if len(newGates) == len(instance.Spec.Controller.SchedulingGates) {
-			// Already been removed, there must be other gates.
-			continue
+		if apimeta.IsStatusConditionTrue(instance.Status.Conditions, computev1alpha.InstanceReady) {
+			readyReplicas++
 		}
+	}
 
-		if _, err := controllerutil.CreateOrPatch(ctx, cl.GetClient(), &instance, func() error {
-			instance.Spec.Controller.SchedulingGates = newGates
-			return nil
-		}); err != nil {
-			return ctrl.Result{}, fmt.Errorf("failed updating instance: %w", err)
+	patchResult, err := controllerutil.CreateOrPatch(ctx, cl.GetClient(), &deployment, func() error {
+		deployment.Status.Replicas = int32(replicas)
+		deployment.Status.CurrentReplicas = int32(currentReplicas)
+		deployment.Status.DesiredReplicas = int32(desiredReplicas)
+
+		if readyReplicas > 0 {
+			apimeta.SetStatusCondition(&deployment.Status.Conditions, metav1.Condition{
+				Type:    computev1alpha.WorkloadDeploymentAvailable,
+				Status:  metav1.ConditionTrue,
+				Reason:  "StableInstanceFound",
+				Message: fmt.Sprintf("%d/%d instances are ready", readyReplicas, replicas),
+			})
+		} else {
 		}
+
+		return nil
+	})
+
+	if err != nil {
+		return ctrl.Result{}, fmt.Errorf("failed updating deployment status: %w", err)
 	}
 
-	// TODO(jreese) update deployment status conditions
+	logger.Info("deployment status processed", "operation_result", patchResult)
 
 	return ctrl.Result{}, nil
 }