From e15a1de4dfb6b0a3885d511232ff0d2e05de5bee Mon Sep 17 00:00:00 2001 From: charlie Date: Thu, 28 Sep 2023 16:18:00 +0800 Subject: [PATCH] resolve conflict --- .../internal/controller/moduledeployment_controller.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module-controller/internal/controller/moduledeployment_controller.go b/module-controller/internal/controller/moduledeployment_controller.go index e8e9d05de..7c9423ce0 100644 --- a/module-controller/internal/controller/moduledeployment_controller.go +++ b/module-controller/internal/controller/moduledeployment_controller.go @@ -110,7 +110,7 @@ func (r *ModuleDeploymentReconciler) Reconcile(ctx context.Context, req ctrl.Req return ctrl.Result{}, err } case moduledeploymentv1alpha1.ModuleDeploymentReleaseProgressExecuting: - return r.updateModuleReplicaSet(ctx, moduleDeployment, newRS, oldRSs) + return r.updateModuleReplicaSet(ctx, moduleDeployment, newRS) case moduledeploymentv1alpha1.ModuleDeploymentReleaseProgressCompleted: if moduleDeployment.Spec.Replicas != newRS.Spec.Replicas { moduleDeployment.Status.ReleaseStatus.Progress = moduledeploymentv1alpha1.ModuleDeploymentReleaseProgressExecuting @@ -310,7 +310,7 @@ func (r *ModuleDeploymentReconciler) updateModuleReplicas( } func (r *ModuleDeploymentReconciler) updateModuleReplicaSet(ctx context.Context, moduleDeployment *moduledeploymentv1alpha1.ModuleDeployment, - newRS *moduledeploymentv1alpha1.ModuleReplicaSet, oldRSs []*moduledeploymentv1alpha1.ModuleReplicaSet) (ctrl.Result, error) { + newRS *moduledeploymentv1alpha1.ModuleReplicaSet) (ctrl.Result, error) { var ( batchCount = moduleDeployment.Spec.OperationStrategy.BatchCount curBatch = moduleDeployment.Status.ReleaseStatus.CurrentBatch