Merge pull request #59166 from zhangxiaoyu-zidif/clean-err-rbd

Automatic merge from submit-queue (batch tested with PRs 63251, 59166, 63250, 63180, 63169). 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>. clean one redundant comment of rbd.go **What this PR does / why we need it**: This is a small PR for cleanup. **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 #59166 from zhangxiaoyu-zidif/clean-err-rbd
0ae7fd3d · Kubernetes Submit Queue · GitHub · 95841fe5 · 03d338a7 · 0ae7fd3d
Unverified Commit 0ae7fd3d authored Apr 27, 2018 by Kubernetes Submit Queue Committed by GitHub Apr 27, 2018
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

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

No files found.
--- a/pkg/volume/rbd/rbd.go
+++ b/pkg/volume/rbd/rbd.go
@@ -434,7 +434,6 @@ func (plugin *rbdPlugin) NewBlockVolumeMapper(spec *volume.Spec, pod *v1.Pod, _ 
 		uid = pod.UID
 	}
 	secret := ""
-	// var err error
 	if pod != nil {
 		secretName, secretNs, err := getSecretNameAndNamespace(spec, pod.Namespace)
 		if err != nil {
@@ -862,7 +861,6 @@ func (rbd *rbdDiskMapper) SetUpDevice() (string, error) {
 }
 func (rbd *rbd) rbdGlobalMapPath(spec *volume.Spec) (string, error) {
-	var err error
 	mon, err := getVolumeSourceMonitors(spec)
 	if err != nil {
 		return "", err