Skip to content

Commit 0250371

Browse files
authored
Fix error logging in ReconcileMasterCR to use correct error variable (#2547)
Signed-off-by: Daniel Fan <[email protected]>
1 parent 160a02b commit 0250371

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

internal/controller/commonservice_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,13 +256,13 @@ func (r *CommonServiceReconciler) ReconcileMasterCR(ctx context.Context, instanc
256256
instance.Status.Phase = apiv3.CRUpdating
257257
newConfigs, serviceControllerMapping, statusErr := r.getNewConfigs(cs)
258258
if statusErr != nil {
259-
klog.Errorf("Fail to reconcile %s/%s: %v", instance.Namespace, instance.Name, err)
259+
klog.Errorf("Fail to reconcile %s/%s: %v", instance.Namespace, instance.Name, statusErr)
260260
instance.SetErrorCondition(constant.MasterCR, apiv3.ConditionTypeError, corev1.ConditionTrue, apiv3.ConditionReasonError, statusErr.Error())
261261
instance.Status.Phase = apiv3.CRFailed
262262
}
263263

264264
if statusErr = r.Client.Status().Update(ctx, instance); statusErr != nil {
265-
klog.Errorf("Fail to update %s/%s: %v", instance.Namespace, instance.Name, err)
265+
klog.Errorf("Fail to update %s/%s: %v", instance.Namespace, instance.Name, statusErr)
266266
return ctrl.Result{}, statusErr
267267
}
268268

0 commit comments

Comments
 (0)