Feat: add workload status to rollout status (openkruise#145)

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

Makefile

@@ -119,7 +119,7 @@ TMP_DIR=$$(mktemp -d) ;\
 cd $$TMP_DIR ;\
 go mod init tmp ;\
 echo "Downloading $(2)" ;\
-GOBIN=$(PROJECT_DIR)/bin go get $(2) ;\
+GOBIN=$(PROJECT_DIR)/bin go install $(2) ;\
 rm -rf $$TMP_DIR ;\
 }
 endef

api/v1alpha1/rollout_types.go

@@ -201,6 +201,9 @@ type RolloutStatus struct {
 
 	// observedGeneration is the most recent generation observed for this Rollout.
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
+	// WorkloadStatus describes the state of the workload.
+	// +optional
+	WorkloadStatus *WorkloadStatus `json:"workloadStatus,omitempty"`
 	// Canary describes the state of the canary rollout
 	// +optional
 	CanaryStatus *CanaryStatus `json:"canaryStatus,omitempty"`
@@ -259,6 +262,21 @@ const (
 	TerminatingReasonCompleted     = "Completed"
 )
 
+type WorkloadStatus struct {
+	// WorkloadState is the state of the workload.
+	WorkloadState WorkloadState `json:"workloadState,omitempty"`
+	// Replicas is the number of desired replicas.
+	Replicas int32 `json:"replicas,omitempty"`
+}
+
+type WorkloadState string
+
+const (
+	WorkloadStateNormal   WorkloadState = "Normal"
+	WorkloadStateIgnore   WorkloadState = "Ignore"
+	WorkloadStateNotFound WorkloadState = "NotFound"
+)
+
 // CanaryStatus status fields that only pertain to the canary rollout
 type CanaryStatus struct {
 	// observedWorkloadGeneration is the most recent generation observed for this Rollout ref workload generation.

config/crd/bases/rollouts.kruise.io_rollouts.yaml

@@ -374,6 +374,17 @@ spec:
                 description: BlueGreenStatus *BlueGreenStatus `json:"blueGreenStatus,omitempty"`
                   Phase is the rollout phase.
                 type: string
+              workloadStatus:
+                description: WorkloadStatus describes the state of the workload.
+                properties:
+                  replicas:
+                    description: Replicas is the number of desired replicas.
+                    format: int32
+                    type: integer
+                  workloadState:
+                    description: WorkloadState is the state of the workload.
+                    type: string
+                type: object
             type: object
         type: object
     served: true

pkg/controller/rollout/rollout_status.go

@@ -62,6 +62,9 @@ func (r *RolloutReconciler) calculateRolloutStatus(rollout *v1alpha1.Rollout) (r
 			ObservedGeneration: rollout.Generation,
 			Phase:              v1alpha1.RolloutPhaseInitial,
 			Message:            "Workload Not Found",
+			WorkloadStatus: &v1alpha1.WorkloadStatus{
+				WorkloadState: v1alpha1.WorkloadStateNotFound,
+			},
 		}
 		klog.Infof("rollout(%s/%s) workload not found, and reset status be Initial", rollout.Namespace, rollout.Name)
 		return false, newStatus, nil
@@ -72,6 +75,13 @@ func (r *RolloutReconciler) calculateRolloutStatus(rollout *v1alpha1.Rollout) (r
 		return true, nil, nil
 	}
 
+	// update workload status
+	if newStatus.WorkloadStatus == nil {
+		newStatus.WorkloadStatus = &v1alpha1.WorkloadStatus{}
+	}
+	newStatus.WorkloadStatus.WorkloadState = v1alpha1.WorkloadStateNormal
+	newStatus.WorkloadStatus.Replicas = workload.Replicas
+
 	// update workload generation to canaryStatus.ObservedWorkloadGeneration
 	// rollout is a target ref bypass, so there needs to be a field to identify the rollout execution process or results,
 	// which version of deployment is targeted, ObservedWorkloadGeneration that is to compare with the workload generation