remove DoTerminating from ModuleDeployment CRD

Charlie17Li · Charlie17Li · commit 75d9e333222a · 2023-11-19T18:08:05.000+08:00
diff --git a/module-controller/api/v1alpha1/moduledeployment_types.go b/module-controller/api/v1alpha1/moduledeployment_types.go
@@ -197,8 +197,6 @@ type ModuleDeploymentStatus struct {
 
 	ReleaseStatus *ReleaseStatus `json:"releaseStatus,omitempty"`
 
-	DoTerminating bool `json:"doTerminating,omitempty"`
-
 	ObservedGeneration int64 `json:"observedGeneration,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
@@ -216,8 +216,6 @@ spec:
                       type: string
                   type: object
                 type: array
-              doTerminating:
-                type: boolean
               observedGeneration:
                 format: int64
                 type: integer
diff --git a/module-controller/internal/controller/moduledeployment_controller.go b/module-controller/internal/controller/moduledeployment_controller.go
@@ -92,13 +92,6 @@ func (r *ModuleDeploymentReconciler) Reconcile(ctx context.Context, req ctrl.Req
 			return ctrl.Result{}, nil
 		}
 
-		if !moduleDeployment.Status.DoTerminating {
-			moduleDeployment.Status.DoTerminating = true
-			if moduleDeployment.Status.ReleaseStatus.Progress != v1alpha1.ModuleDeploymentReleaseProgressTerminating {
-				moduleDeployment.Status.ReleaseStatus.Progress = v1alpha1.ModuleDeploymentReleaseProgressTerminating
-			}
-			return ctrl.Result{}, r.Status().Update(ctx, moduleDeployment)
-		}
 	}
 
 	if moduleDeployment.Generation == 1 {

Original file line number	Diff line number	Diff line change
`@@ -197,8 +197,6 @@ type ModuleDeploymentStatus struct {`
`197`	`197`
`198`	`198`	ReleaseStatus *ReleaseStatus `json:"releaseStatus,omitempty"`
`199`	`199`
`200`		- DoTerminating bool `json:"doTerminating,omitempty"`
`201`		`-`
`202`	`200`	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
`203`	`201`	`}`
`204`	`202`
Original file line number	Diff line number	Diff line change
`@@ -92,13 +92,6 @@ func (r *ModuleDeploymentReconciler) Reconcile(ctx context.Context, req ctrl.Req`
`92`	`92`	`return ctrl.Result{}, nil`
`93`	`93`	`}`
`94`	`94`
`95`		`- if !moduleDeployment.Status.DoTerminating {`
`96`		`- moduleDeployment.Status.DoTerminating = true`
`97`		`- if moduleDeployment.Status.ReleaseStatus.Progress != v1alpha1.ModuleDeploymentReleaseProgressTerminating {`
`98`		`- moduleDeployment.Status.ReleaseStatus.Progress = v1alpha1.ModuleDeploymentReleaseProgressTerminating`
`99`		`- }`
`100`		`- return ctrl.Result{}, r.Status().Update(ctx, moduleDeployment)`
`101`		`- }`
`102`	`95`	`}`
`103`	`96`
`104`	`97`	`if moduleDeployment.Generation == 1 {`