some fixes

Signed-off-by: yunbo <[email protected]>
openkruise · Aug 20, 2024 · c2ef833 · c2ef833
1 parent 5fe4b6f
commit c2ef833
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/api/v1alpha1/rollout_types.go b/api/v1alpha1/rollout_types.go
@@ -171,8 +171,6 @@ type RolloutStatus struct {
 	// Conditions a list of conditions a rollout can have.
 	// +optional
 	Conditions []RolloutCondition `json:"conditions,omitempty"`
-	// +optional
-	//BlueGreenStatus *BlueGreenStatus `json:"blueGreenStatus,omitempty"`
 	// Phase is the rollout phase.
 	Phase RolloutPhase `json:"phase,omitempty"`
 	// Message provides details on why the rollout is in its current phase

diff --git a/api/v1beta1/rollout_types.go b/api/v1beta1/rollout_types.go
@@ -445,7 +445,7 @@ type CanaryStatus struct {
 // BlueGreenStatus status fields that only pertain to the blueGreen rollout
 type BlueGreenStatus struct {
 	CommonStatus `json:",inline"`
-	// CanaryRevision is calculated by rollout based on podTemplateHash, and the internal logic flow uses
+	// UpdatedRevision is calculated by rollout based on podTemplateHash, and the internal logic flow uses
 	// It may be different from rs podTemplateHash in different k8s versions, so it cannot be used as service selector label
 	UpdatedRevision string `json:"updatedRevision"`
 	// UpdatedReplicas the numbers of updated pods

diff --git a/config/crd/bases/rollouts.kruise.io_rollouts.yaml b/config/crd/bases/rollouts.kruise.io_rollouts.yaml
@@ -534,8 +534,7 @@ spec:
                 format: int64
                 type: integer
               phase:
-                description: BlueGreenStatus *BlueGreenStatus `json:"blueGreenStatus,omitempty"`
-                  Phase is the rollout phase.
+                description: Phase is the rollout phase.
                 type: string
             type: object
         type: object
@@ -1475,7 +1474,7 @@ spec:
                     format: int32
                     type: integer
                   updatedRevision:
-                    description: CanaryRevision is calculated by rollout based on
+                    description: UpdatedRevision is calculated by rollout based on
                       podTemplateHash, and the internal logic flow uses It may be
                       different from rs podTemplateHash in different k8s versions,
                       so it cannot be used as service selector label

diff --git a/pkg/controller/rollout/rollout_canary.go b/pkg/controller/rollout/rollout_canary.go
@@ -649,7 +649,7 @@ func (m *canaryReleaseManager) syncBatchRelease(br *v1beta1.BatchRelease, canary
 func nextTask(reason string, currentTask v1beta1.FinalisingStepType) v1beta1.FinalisingStepType {
 	var taskSequence []v1beta1.FinalisingStepType
 	//REVIEW - should we consider more complex scenarios?
-	// like, user pauses Rollout and rollbacks the workload at the same time?
+	// like, user disables Rollout and rollbacks the workload at the same time?
 	switch reason {
 	case v1beta1.FinaliseReasonRollback: // rollback
 		taskSequence = []v1beta1.FinalisingStepType{
@@ -658,7 +658,7 @@ func nextTask(reason string, currentTask v1beta1.FinalisingStepType) v1beta1.Fin
 			v1beta1.FinalisingStepTypeDeleteBR,
 			v1beta1.FinalisingStepTypeTrafficRouting, // do cleaning works(restore stable Service, remove canary Service)
 		}
-	default: // others: success/paused/disabled
+	default: // others: success/disabled/deleting rollout
 		taskSequence = []v1beta1.FinalisingStepType{
 			v1beta1.FinalisingStepTypeTrafficRouting, // remove selector of stable Service
 			v1beta1.FinalisingStepTypeBatchRelease,   // scale up new, scale down old

diff --git a/pkg/controller/rollout/rollout_status.go b/pkg/controller/rollout/rollout_status.go
@@ -238,7 +238,7 @@ func (r *RolloutReconciler) reconcileRolloutTerminating(rollout *v1beta1.Rollout
 		klog.Errorf("rollout(%s/%s) get workload failed: %s", rollout.Namespace, rollout.Name, err.Error())
 		return nil, err
 	}
-	c := &RolloutContext{Rollout: rollout, NewStatus: newStatus, Workload: workload}
+	c := &RolloutContext{Rollout: rollout, NewStatus: newStatus, Workload: workload, FinalizeReason: v1beta1.FinaliseReasonDelete}
 	done, err := r.doFinalising(c)
 	if err != nil {
 		return nil, err
@@ -262,7 +262,7 @@ func (r *RolloutReconciler) reconcileRolloutDisabling(rollout *v1beta1.Rollout,
 		klog.Errorf("rollout(%s/%s) get workload failed: %s", rollout.Namespace, rollout.Name, err.Error())
 		return nil, err
 	}
-	c := &RolloutContext{Rollout: rollout, NewStatus: newStatus, Workload: workload}
+	c := &RolloutContext{Rollout: rollout, NewStatus: newStatus, Workload: workload, FinalizeReason: v1beta1.FinaliseReasonDisalbed}
 	done, err := r.doFinalising(c)
 	if err != nil {
 		return nil, err