diff --git a/pkg/controller/volume/expand/expand_controller.go b/pkg/controller/volume/expand/expand_controller.go index ee241626d24..2332f322fad 100644 --- a/pkg/controller/volume/expand/expand_controller.go +++ b/pkg/controller/volume/expand/expand_controller.go @@ -100,11 +100,11 @@ func NewExpandController( pvcsSynced: pvcInformer.Informer().HasSynced, pvLister: pvInformer.Lister(), pvSynced: pvInformer.Informer().HasSynced, - queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "expand"), + queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "volume_expand"), } if err := expc.volumePluginMgr.InitPlugins(plugins, nil, expc); err != nil { - return nil, fmt.Errorf("Could not initialize volume plugins for Expand Controller : %+v", err) + return nil, fmt.Errorf("could not initialize volume plugins for Expand Controller : %+v", err) } eventBroadcaster := record.NewBroadcaster() @@ -156,7 +156,7 @@ func (expc *expandController) enqueuePVC(obj interface{}) { if pvc.Status.Phase == v1.ClaimBound && size.Cmp(statusSize) > 0 { key, err := kcache.DeletionHandlingMetaNamespaceKeyFunc(pvc) if err != nil { - runtime.HandleError(fmt.Errorf("Couldn't get key for object %#v: %v", pvc, err)) + runtime.HandleError(fmt.Errorf("couldn't get key for object %#v: %v", pvc, err)) return } expc.queue.Add(key) @@ -202,7 +202,7 @@ func (expc *expandController) syncHandler(key string) error { return err } if pv.Spec.ClaimRef == nil || pvc.Namespace != pv.Spec.ClaimRef.Namespace || pvc.UID != pv.Spec.ClaimRef.UID { - err := fmt.Errorf("Persistent Volume is not bound to PVC being updated : %s", util.ClaimToClaimKey(pvc)) + err := fmt.Errorf("persistent Volume is not bound to PVC being updated : %s", util.ClaimToClaimKey(pvc)) klog.V(4).Infof("%v", err) return err } @@ -217,7 +217,7 @@ func (expc *expandController) syncHandler(key string) error { eventType = v1.EventTypeWarning } expc.recorder.Event(pvc, eventType, events.ExternalExpanding, fmt.Sprintf("Ignoring the PVC: %v.", msg)) - klog.V(3).Infof("Ignoring the PVC %q (uid: %q) : %v.", util.GetPersistentVolumeClaimQualifiedName(pvc), pvc.UID, msg) + klog.Infof("Ignoring the PVC %q (uid: %q) : %v.", util.GetPersistentVolumeClaimQualifiedName(pvc), pvc.UID, msg) return err } diff --git a/pkg/volume/util/resize_util.go b/pkg/volume/util/resize_util.go index 22e98e7fe5f..52398412e5e 100644 --- a/pkg/volume/util/resize_util.go +++ b/pkg/volume/util/resize_util.go @@ -59,24 +59,24 @@ func UpdatePVSize( oldData, err := json.Marshal(pvClone) if err != nil { - return fmt.Errorf("Unexpected error marshaling old PV %q with error : %v", pvClone.Name, err) + return fmt.Errorf("unexpected error marshaling old PV %q with error : %v", pvClone.Name, err) } pvClone.Spec.Capacity[v1.ResourceStorage] = newSize newData, err := json.Marshal(pvClone) if err != nil { - return fmt.Errorf("Unexpected error marshaling new PV %q with error : %v", pvClone.Name, err) + return fmt.Errorf("unexpected error marshaling new PV %q with error : %v", pvClone.Name, err) } patchBytes, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, pvClone) if err != nil { - return fmt.Errorf("Error Creating two way merge patch for PV %q with error : %v", pvClone.Name, err) + return fmt.Errorf("error Creating two way merge patch for PV %q with error : %v", pvClone.Name, err) } _, err = kubeClient.CoreV1().PersistentVolumes().Patch(pvClone.Name, types.StrategicMergePatchType, patchBytes) if err != nil { - return fmt.Errorf("Error Patching PV %q with error : %v", pvClone.Name, err) + return fmt.Errorf("error Patching PV %q with error : %v", pvClone.Name, err) } return nil } @@ -144,13 +144,13 @@ func PatchPVCStatus( kubeClient clientset.Interface) (*v1.PersistentVolumeClaim, error) { patchBytes, err := createPVCPatch(oldPVC, newPVC) if err != nil { - return nil, fmt.Errorf("PatchPVCStatus failed to patch PVC %q: %v", oldPVC.Name, err) + return nil, fmt.Errorf("patchPVCStatus failed to patch PVC %q: %v", oldPVC.Name, err) } updatedClaim, updateErr := kubeClient.CoreV1().PersistentVolumeClaims(oldPVC.Namespace). Patch(oldPVC.Name, types.StrategicMergePatchType, patchBytes, "status") if updateErr != nil { - return nil, fmt.Errorf("PatchPVCStatus failed to patch PVC %q: %v", oldPVC.Name, updateErr) + return nil, fmt.Errorf("patchPVCStatus failed to patch PVC %q: %v", oldPVC.Name, updateErr) } return updatedClaim, nil }