github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

name the queue properly and use lower case for error message

Browse Source
This commit is contained in:
Hemant Kumar 2019-05-16 21:16:37 -04:00
parent 673773cbde
commit 4886e8782c
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/controller/volume/expand/expand_controller.go
View File

@ -100,11 +100,11 @@ func NewExpandController(
pvcsSynced: pvcInformer.Informer().HasSynced, pvcsSynced: pvcInformer.Informer().HasSynced,
pvLister: pvInformer.Lister(), pvLister: pvInformer.Lister(),
pvSynced: pvInformer.Informer().HasSynced, 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 { 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() eventBroadcaster := record.NewBroadcaster()
@ -156,7 +156,7 @@ func (expc *expandController) enqueuePVC(obj interface{}) {
if pvc.Status.Phase == v1.ClaimBound && size.Cmp(statusSize) > 0 { if pvc.Status.Phase == v1.ClaimBound && size.Cmp(statusSize) > 0 {
key, err := kcache.DeletionHandlingMetaNamespaceKeyFunc(pvc) key, err := kcache.DeletionHandlingMetaNamespaceKeyFunc(pvc)
if err != nil { 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 return
} }
expc.queue.Add(key) expc.queue.Add(key)
@ -202,7 +202,7 @@ func (expc *expandController) syncHandler(key string) error {
return err return err
} }
if pv.Spec.ClaimRef == nil || pvc.Namespace != pv.Spec.ClaimRef.Namespace || pvc.UID != pv.Spec.ClaimRef.UID { 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) klog.V(4).Infof("%v", err)
return err return err
} }
@ -217,7 +217,7 @@ func (expc *expandController) syncHandler(key string) error {
eventType = v1.EventTypeWarning eventType = v1.EventTypeWarning
} }
expc.recorder.Event(pvc, eventType, events.ExternalExpanding, fmt.Sprintf("Ignoring the PVC: %v.", msg)) 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 return err
} }

12
pkg/volume/util/resize_util.go
View File

@ -59,24 +59,24 @@ func UpdatePVSize(
oldData, err := json.Marshal(pvClone) oldData, err := json.Marshal(pvClone)
if err != nil { 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 pvClone.Spec.Capacity[v1.ResourceStorage] = newSize
newData, err := json.Marshal(pvClone) newData, err := json.Marshal(pvClone)
if err != nil { 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) patchBytes, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, pvClone)
if err != nil { 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) _, err = kubeClient.CoreV1().PersistentVolumes().Patch(pvClone.Name, types.StrategicMergePatchType, patchBytes)
if err != nil { 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 return nil
} }
@ -144,13 +144,13 @@ func PatchPVCStatus(
kubeClient clientset.Interface) (*v1.PersistentVolumeClaim, error) { kubeClient clientset.Interface) (*v1.PersistentVolumeClaim, error) {
patchBytes, err := createPVCPatch(oldPVC, newPVC) patchBytes, err := createPVCPatch(oldPVC, newPVC)
if err != nil { 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). updatedClaim, updateErr := kubeClient.CoreV1().PersistentVolumeClaims(oldPVC.Namespace).
Patch(oldPVC.Name, types.StrategicMergePatchType, patchBytes, "status") Patch(oldPVC.Name, types.StrategicMergePatchType, patchBytes, "status")
if updateErr != nil { 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 return updatedClaim, nil
} }