Skip to content
This repository has been archived by the owner on Feb 18, 2024. It is now read-only.

Commit

Permalink
resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@Charlie17Li
Charlie17Li committed Sep 28, 2023
1 parent 2a13c38 commit e15a1de
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions module-controller/internal/controller/moduledeployment_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit e15a1de

Please sign in to comment.