resolve conflict

sofastack · Sep 25, 2023 · 4106469 · 4106469
1 parent 5dae446
commit 4106469
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/module-controller/internal/controller/moduledeployment_controller.go b/module-controller/internal/controller/moduledeployment_controller.go
@@ -388,16 +388,30 @@ func (r *ModuleDeploymentReconciler) updateModuleReplicaSet(moduleDeployment *mo
 	}
 
 	moduleDeployment.Status.ReleaseStatus.CurrentBatch += 1
-	moduleDeployment.Status.ReleaseStatus.Progress = moduledeploymentv1alpha1.ModuleDeploymentReleaseProgressExecuting
 	moduleDeployment.Status.ReleaseStatus.LastTransitionTime = metav1.Now()
+
+	var grayTime = 0
+
+	if moduleDeployment.Spec.OperationStrategy.NeedConfirm {
+		moduleDeployment.Status.ReleaseStatus.Progress = moduledeploymentv1alpha1.ModuleDeploymentReleaseProgressWaitingForConfirmation
+	} else if grayTime = int(moduleDeployment.Spec.OperationStrategy.GrayTimeBetweenBatchSeconds); grayTime != 0 {
+		if curBatch == batchCount {
+			moduleDeployment.Status.ReleaseStatus.Progress = moduledeploymentv1alpha1.ModuleDeploymentReleaseProgressExecuting
+		} else {
+			moduleDeployment.Status.ReleaseStatus.Progress = moduledeploymentv1alpha1.ModuleDeploymentReleaseProgressPaused
+		}
+	} else {
+		moduleDeployment.Status.ReleaseStatus.Progress = moduledeploymentv1alpha1.ModuleDeploymentReleaseProgressExecuting
+	}
+
 	moduleDeployment.Status.Conditions = append(moduleDeployment.Status.Conditions, moduledeploymentv1alpha1.ModuleDeploymentCondition{
 		Type:               moduledeploymentv1alpha1.DeploymentProgressing,
 		Status:             corev1.ConditionTrue,
 		LastTransitionTime: metav1.Now(),
 		Message:            fmt.Sprintf("deployment release: curbatch %v, batchCount %v", curBatch, batchCount),
 	})
 
-	return false, r.Status().Update(ctx, moduleDeployment)
+	return grayTime == 0, r.Status().Update(ctx, moduleDeployment)
 }
 
 // generate module replicas