Skip to content

Commit 58901e9

Browse files
committed
new is not a good name since new() is a buildin function in golang
1 parent c38053a commit 58901e9

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

pkg/controller/distributedrediscluster/distributedrediscluster_controller.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,9 @@ func (r *ReconcileDistributedRedisCluster) Reconcile(request reconcile.Request)
175175
return reconcile.Result{}, nil
176176
}
177177
reqLogger.WithValues("err", err).Info("ensureCluster")
178-
new := instance.Status.DeepCopy()
179-
SetClusterScaling(new, err.Error())
180-
r.updateClusterIfNeed(instance, new, reqLogger)
178+
newStatus := instance.Status.DeepCopy()
179+
SetClusterScaling(newStatus, err.Error())
180+
r.updateClusterIfNeed(instance, newStatus, reqLogger)
181181
return reconcile.Result{RequeueAfter: requeueAfter}, nil
182182
}
183183

@@ -202,9 +202,9 @@ func (r *ReconcileDistributedRedisCluster) Reconcile(request reconcile.Request)
202202
return reconcile.Result{}, err
203203
}
204204
reqLogger.WithValues("err", err).Info("waitPodReady")
205-
new := instance.Status.DeepCopy()
206-
SetClusterScaling(new, err.Error())
207-
r.updateClusterIfNeed(instance, new, reqLogger)
205+
newStatus := instance.Status.DeepCopy()
206+
SetClusterScaling(newStatus, err.Error())
207+
r.updateClusterIfNeed(instance, newStatus, reqLogger)
208208
return reconcile.Result{RequeueAfter: requeueAfter}, nil
209209
}
210210

@@ -243,9 +243,9 @@ func (r *ReconcileDistributedRedisCluster) Reconcile(request reconcile.Request)
243243
reqLogger.WithValues("err", err).Info("requeue")
244244
return reconcile.Result{RequeueAfter: requeueAfter}, nil
245245
}
246-
new := instance.Status.DeepCopy()
247-
SetClusterFailed(new, err.Error())
248-
r.updateClusterIfNeed(instance, new, reqLogger)
246+
newStatus := instance.Status.DeepCopy()
247+
SetClusterFailed(newStatus, err.Error())
248+
r.updateClusterIfNeed(instance, newStatus, reqLogger)
249249
return reconcile.Result{}, err
250250
}
251251

@@ -281,9 +281,9 @@ func (r *ReconcileDistributedRedisCluster) Reconcile(request reconcile.Request)
281281
reqLogger.Info(">>>>>> clustering")
282282
err = r.syncCluster(ctx)
283283
if err != nil {
284-
new := instance.Status.DeepCopy()
285-
SetClusterFailed(new, err.Error())
286-
r.updateClusterIfNeed(instance, new, reqLogger)
284+
newStatus := instance.Status.DeepCopy()
285+
SetClusterFailed(newStatus, err.Error())
286+
r.updateClusterIfNeed(instance, newStatus, reqLogger)
287287
return reconcile.Result{}, err
288288
}
289289
}

0 commit comments

Comments
 (0)