Merge pull request #66202 from tanshanshan/fixformat

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix wrong description **What this PR does / why we need it**: fix wrong description **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #66202 from tanshanshan/fixformat
69176615 · Kubernetes Submit Queue · GitHub · 9e0c4a60 · 3ed38737 · 69176615
Unverified Commit 69176615 authored Jul 24, 2018 by Kubernetes Submit Queue Committed by GitHub Jul 24, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

host_path.go pkg/volume/host_path/host_path.go +1 -1

quobyte.go pkg/volume/quobyte/quobyte.go +1 -1

rbd.go pkg/volume/rbd/rbd.go +2 -2

No files found.
--- a/pkg/volume/host_path/host_path.go
+++ b/pkg/volume/host_path/host_path.go
@@ -132,7 +132,7 @@ func (plugin *hostPathPlugin) NewUnmounter(volName string, podUID types.UID) (vo
 // HostPath recycling only works in single node clusters and is meant for testing purposes only.
 func (plugin *hostPathPlugin) Recycle(pvName string, spec *volume.Spec, eventRecorder recyclerclient.RecycleEventRecorder) error {
 	if spec.PersistentVolume == nil || spec.PersistentVolume.Spec.HostPath == nil {
-		return fmt.Errorf("spec.PersistentVolumeSource.HostPath is nil")
+		return fmt.Errorf("spec.PersistentVolume.Spec.HostPath is nil")
 	}

 	pod := plugin.config.RecyclerPodTemplate

--- a/pkg/volume/quobyte/quobyte.go
+++ b/pkg/volume/quobyte/quobyte.go
@@ -306,7 +306,7 @@ type quobyteVolumeDeleter struct {

 func (plugin *quobytePlugin) NewDeleter(spec *volume.Spec) (volume.Deleter, error) {
 	if spec.PersistentVolume != nil && spec.PersistentVolume.Spec.Quobyte == nil {
-		return nil, fmt.Errorf("spec.PersistentVolumeSource.Spec.Quobyte is nil")
+		return nil, fmt.Errorf("spec.PersistentVolume.Spec.Quobyte is nil")
 	}

 	return plugin.newDeleterInternal(spec)

--- a/pkg/volume/rbd/rbd.go
+++ b/pkg/volume/rbd/rbd.go
@@ -162,7 +162,7 @@ func (plugin *rbdPlugin) getAdminAndSecret(spec *volume.Spec) (string, string, e

 func (plugin *rbdPlugin) ExpandVolumeDevice(spec *volume.Spec, newSize resource.Quantity, oldSize resource.Quantity) (resource.Quantity, error) {
 	if spec.PersistentVolume != nil && spec.PersistentVolume.Spec.RBD == nil {
-		return oldSize, fmt.Errorf("spec.PersistentVolumeSource.Spec.RBD is nil")
+		return oldSize, fmt.Errorf("spec.PersistentVolume.Spec.RBD is nil")
 	}

 	// get admin and secret
@@ -540,7 +540,7 @@ func (plugin *rbdPlugin) getDeviceNameFromOldMountPath(mounter mount.Interface, 

 func (plugin *rbdPlugin) NewDeleter(spec *volume.Spec) (volume.Deleter, error) {
 	if spec.PersistentVolume != nil && spec.PersistentVolume.Spec.RBD == nil {
-		return nil, fmt.Errorf("spec.PersistentVolumeSource.Spec.RBD is nil")
+		return nil, fmt.Errorf("spec.PersistentVolume.Spec.RBD is nil")
 	}

 	admin, secret, err := plugin.getAdminAndSecret(spec)