Use klog.Info instead of Infof and User errors.New instead of fmt.Errorf

Author: Aishwarya-Hebbar

pkg/controller/controller.go

@@ -18,11 +18,12 @@ package controller
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
 	"github.com/kubernetes-csi/external-resizer/pkg/features"
-	"k8s.io/apimachinery/pkg/api/errors"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 
 	"github.com/kubernetes-csi/external-resizer/pkg/resizer"
 	"github.com/kubernetes-csi/external-resizer/pkg/util"
@@ -460,7 +461,7 @@ func (ctrl *resizeController) resizePVC(pvc *v1.PersistentVolumeClaim, pv *v1.Pe
 		// Record an event to indicate that resizer is not expanding the pvc
 		msg := fmt.Sprintf("Unable to expand %s because CSI driver %s only supports offline expansion and volume is currently in-use", klog.KObj(pvc), ctrl.resizer.Name())
 		ctrl.eventRecorder.Event(pvc, v1.EventTypeWarning, util.VolumeResizeFailed, msg)
-		return fmt.Errorf(msg)
+		return errors.New(msg)
 	}
 
 	// Record an event to indicate that external resizer is resizing this volume.
@@ -481,7 +482,7 @@ func (ctrl *resizeController) resizePVC(pvc *v1.PersistentVolumeClaim, pv *v1.Pe
 		return ctrl.markPVCResizeFinished(pvc, newSize)
 	}()
 
-	if err != nil && !errors.IsConflict(err) /* ignore conflicts as they should be silently retried */ {
+	if err != nil && !apierrors.IsConflict(err) /* ignore conflicts as they should be silently retried */ {
 		// Record an event to indicate that resize operation is failed.
 		ctrl.eventRecorder.Eventf(pvc, v1.EventTypeWarning, util.VolumeResizeFailed, err.Error())
 	}

pkg/controller/expand_and_recover.go

@@ -17,6 +17,7 @@ limitations under the License.
 package controller
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/kubernetes-csi/external-resizer/pkg/util"
@@ -153,7 +154,7 @@ func (ctrl *resizeController) expandAndRecover(pvc *v1.PersistentVolumeClaim, pv
 	if allocatedSize != nil && allocatedSize.Cmp(newSize) == 0 {
 		if inSlowSet {
 			msg := fmt.Sprintf("skipping volume expansion for pvc %s, because expansion previously failed with infeasible error", pvcKey)
-			klog.V(4).Infof(msg)
+			klog.V(4).Info(msg)
 			delayRetryError := util.NewDelayRetryError(msg, ctrl.slowSet.TimeRemaining(pvcKey))
 			return pvc, pv, delayRetryError, resizeNotCalled
 		}
@@ -172,7 +173,7 @@ func (ctrl *resizeController) expandAndRecover(pvc *v1.PersistentVolumeClaim, pv
 		// Record an event to indicate that resizer is not expanding the pvc
 		msg := fmt.Sprintf("Unable to expand %s because CSI driver %s only supports offline expansion and volume is currently in-use", klog.KObj(pvc), ctrl.resizer.Name())
 		ctrl.eventRecorder.Event(pvc, v1.EventTypeWarning, util.VolumeResizeFailed, msg)
-		return pvc, pv, fmt.Errorf(msg), resizeNotCalled
+		return pvc, pv, errors.New(msg), resizeNotCalled
 	}
 
 	// Record an event to indicate that external resizer is resizing this volume.

pkg/modifycontroller/modify_volume.go

@@ -186,7 +186,7 @@ func (ctrl *modifyController) delayModificationIfRecentlyInfeasible(pvc *v1.Pers
 
 	if inSlowSet {
 		msg := fmt.Sprintf("skipping volume modification for pvc %s, because modification previously failed with infeasible error", pvcKey)
-		klog.V(4).Infof(msg)
+		klog.V(4).Info(msg)
 		delayRetryError := util.NewDelayRetryError(msg, ctrl.slowSet.TimeRemaining(pvcKey))
 		return delayRetryError
 	}