Merge pull request #58513 from humblec/custom-name2

Automatic merge from submit-queue (batch tested with PRs 58438, 58523, 58513, 57948). 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>. Add Namespace to glusterfs custom volume names. For better isolation of volumes, users/admins would like to include `namespace` in custom volume names. This patch adds that support. Signed-off-by: Humble Chirammal <hchiramm@redhat.com> **What this PR does / why we need it**: **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 ```

Merge pull request #58513 from humblec/custom-name2
1cb86fa1 · Kubernetes Submit Queue · GitHub · ecb3d7bb · 2c34b9cf · 1cb86fa1
Unverified Commit 1cb86fa1 authored Jan 23, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 23, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/pkg/volume/glusterfs/glusterfs.go
+++ b/pkg/volume/glusterfs/glusterfs.go
@@ -765,7 +765,7 @@ func (p *glusterfsVolumeProvisioner) CreateVolume(gid int) (r *v1.GlusterfsVolum
 	}
 	if p.provisionerConfig.volumeNamePrefix != "" {
-		customVolumeName = fmt.Sprintf("%s_%s_%s", p.provisionerConfig.volumeNamePrefix, p.options.PVC.Name, uuid.NewUUID())
+		customVolumeName = fmt.Sprintf("%s_%s_%s_%s", p.provisionerConfig.volumeNamePrefix, p.options.PVC.Namespace, p.options.PVC.Name, uuid.NewUUID())
 	}
 	gid64 := int64(gid)