From 853771823595f0642c2e37143de8e45d313cd85e Mon Sep 17 00:00:00 2001
From: LiuLiqi <837397251@qq.com>
Date: Wed, 17 Jan 2024 13:42:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E6=B5=8B=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0ConfirmBatchNum=E9=BB=98=E8=AE=A4=E5=80=BC?=
 =?UTF-8?q?=E4=B8=BA0=E7=9A=84=E6=B3=A8=E9=87=8A=EF=BC=8C=E4=BD=BF?=
 =?UTF-8?q?=E5=85=B6=E4=B8=BA0=E6=97=B6=E4=B9=9F=E5=9C=A8yaml=E4=B8=AD?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/v1alpha1/moduledeployment_types.go       |  1 +
 .../serverless.alipay.com_moduledeployments.yaml |  1 +
 ...nt_controller_operation_strategy_suit_test.go | 16 ++++++++++------
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/module-controller/api/v1alpha1/moduledeployment_types.go b/module-controller/api/v1alpha1/moduledeployment_types.go
index 5ef511b70..afe5e91e4 100644
--- a/module-controller/api/v1alpha1/moduledeployment_types.go
+++ b/module-controller/api/v1alpha1/moduledeployment_types.go
@@ -163,6 +163,7 @@ type ModuleDeploymentSpec struct {
 
 	ProgressDeadlineSeconds int32 `json:"progressDeadlineSeconds,omitempty"`
 
+	// +kubebuilder:default:=0
 	// +kubebuilder:validation:Minimum=0
 	ConfirmBatchNum int32 `json:"confirmBatchNum,omitempty"`
 
diff --git a/module-controller/config/crd/bases/serverless.alipay.com_moduledeployments.yaml b/module-controller/config/crd/bases/serverless.alipay.com_moduledeployments.yaml
index baa2324af..78f4e4af9 100644
--- a/module-controller/config/crd/bases/serverless.alipay.com_moduledeployments.yaml
+++ b/module-controller/config/crd/bases/serverless.alipay.com_moduledeployments.yaml
@@ -42,6 +42,7 @@ spec:
                 minLength: 1
                 type: string
               confirmBatchNum:
+                default: 0
                 format: int32
                 minimum: 0
                 type: integer
diff --git a/module-controller/internal/controller/moduledeployment_controller_operation_strategy_suit_test.go b/module-controller/internal/controller/moduledeployment_controller_operation_strategy_suit_test.go
index 2f2aad225..e9171b3f1 100644
--- a/module-controller/internal/controller/moduledeployment_controller_operation_strategy_suit_test.go
+++ b/module-controller/internal/controller/moduledeployment_controller_operation_strategy_suit_test.go
@@ -578,7 +578,7 @@ var _ = Describe("ModuleDeployment Controller OperationStrategy Test", func() {
 					return err
 				}
 
-				if !moduleDeployment.Spec.Pause {
+				if moduleDeployment.Spec.ConfirmBatchNum > 0 {
 					return fmt.Errorf("the deployment is not paused")
 				}
 
@@ -593,18 +593,22 @@ var _ = Describe("ModuleDeployment Controller OperationStrategy Test", func() {
 			Eventually(func() bool {
 				Expect(k8sClient.Get(context.TODO(), nn, &moduleDeployment)).Should(Succeed())
 
-				moduleDeployment.Spec.Pause = false
+				moduleDeployment.Spec.ConfirmBatchNum = 1
 				return Expect(k8sClient.Update(context.TODO(), &moduleDeployment)).Should(Succeed())
 			}, timeout, interval).Should(BeTrue())
 		})
 
+		It("wait moduleDeployment Completed", func() {
+			waitModuleDeploymentCompleted(moduleDeploymentName, namespace)
+		})
+
 		It("4. check if the moduleDeployment status is completed", func() {
 			Eventually(func() bool {
 				if k8sClient.Get(context.TODO(), nn, &moduleDeployment) != nil {
 					return false
 				}
 
-				if moduleDeployment.Spec.Pause != false {
+				if moduleDeployment.Spec.ConfirmBatchNum != 0 {
 					return false
 				}
 
@@ -627,7 +631,7 @@ var _ = Describe("ModuleDeployment Controller OperationStrategy Test", func() {
 					return err
 				}
 
-				if !moduleDeployment.Spec.Pause {
+				if moduleDeployment.Spec.ConfirmBatchNum > 0 {
 					return fmt.Errorf("the deployment is not paused")
 				}
 
@@ -642,7 +646,7 @@ var _ = Describe("ModuleDeployment Controller OperationStrategy Test", func() {
 			Eventually(func() bool {
 				Expect(k8sClient.Get(context.TODO(), nn, &moduleDeployment)).Should(Succeed())
 
-				moduleDeployment.Spec.Pause = false
+				moduleDeployment.Spec.ConfirmBatchNum = 1
 				return Expect(k8sClient.Update(context.TODO(), &moduleDeployment)).Should(Succeed())
 			}, timeout, interval).Should(BeTrue())
 		})
@@ -653,7 +657,7 @@ var _ = Describe("ModuleDeployment Controller OperationStrategy Test", func() {
 					return err
 				}
 
-				if moduleDeployment.Spec.Pause != false {
+				if moduleDeployment.Spec.ConfirmBatchNum != 1 {
 					return fmt.Errorf("the module-deployment is paused")
 				}