Merge pull request #52691 from mtanino/issue/52690

Automatic merge from submit-queue (batch tested with PRs 52675, 52691). 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>.. FC plugin: Return target wwn + lun at GetVolumeName() **What this PR does / why we need it**: At volume attach/detach controller, GetVolumeName() is expected to return unique volume identifier, but FC plugin didn't return unique identifier if user specified FC volume using target wwn and lun. In order to return unique identifier, GetVolumeName() should use combination of target wwn and lun. **Which issue this PR fixes** : fixes #52690 **Special notes for your reviewer**: Should we use same format of unique volume identifier between v1.7 and v1.8 `for the purpose of backward compatibility?` - At v1.7(before introducing attach/detach function), unique ID was pod's uuid + volume name ``` I0918 22:47:13.113481 44661 reconciler.go:257] operationExecutor.MountVolume started for volume "pv0001" (UniqueName: "kubernetes.io/fc/d6c66980-9ce4-11e7-8bb7-f8bc12550954-pv0001") pod "nginx-pod1" (UID: "d6c66980-9ce4-11e7-8bb7-f8bc12550954") I0918 22:47:15.116584 44661 operation_generator.go:476] MountVolume.SetUp succeeded for volume "pv0001" (UniqueName: "kubernetes.io/fc/d6c66980-9ce4-11e7-8bb7-f8bc12550954-pv0001") pod "nginx-pod1" (UID: "d6c66980-9ce4-11e7-8bb7-f8bc12550954") ``` - At latest master, unique ID is targetWWNs.(if a user specifies a volume using target wwn + lun) ``` I0918 22:23:48.389339 1016 reconciler.go:212] operationExecutor.VerifyControllerAttachedVolume started for volume "pv0001" (UniqueName: "kubernetes.io/fc/[78060e801049abcd]") pod "nginx-pod3" (UID: "8f76b894-9ce1-11e7-b8f4-f8bc12550954") ``` /cc @jsafrane @rootfs @msau42 @jingxu97 **Release note**: ``` NONE ```

Merge pull request #52691 from mtanino/issue/52690
26bb28b0 · Kubernetes Submit Queue · GitHub · a3d92d0f · a95a1ff6 · 26bb28b0
Commit 26bb28b0 authored Sep 20, 2017 by Kubernetes Submit Queue Committed by GitHub Sep 20, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

fc.go pkg/volume/fc/fc.go +5 -2

No files found.
--- a/pkg/volume/fc/fc.go
+++ b/pkg/volume/fc/fc.go
@@ -61,9 +61,12 @@ func (plugin *fcPlugin) GetVolumeName(spec *volume.Spec) (string, error) {
 		return "", err
 	}
-	if len(volumeSource.TargetWWNs) != 0 {
+	// API server validates these parameters beforehand but attach/detach
+	// controller creates volumespec without validation. They may be nil
+	// or zero length. We should check again to avoid unexpected conditions.
+	if len(volumeSource.TargetWWNs) != 0 && volumeSource.Lun != nil {
 		// TargetWWNs are the FibreChannel target worldwide names
-		return fmt.Sprintf("%v", volumeSource.TargetWWNs), nil
+		return fmt.Sprintf("%v:%v", volumeSource.TargetWWNs, *volumeSource.Lun), nil
 	} else if len(volumeSource.WWIDs) != 0 {
 		// WWIDs are the FibreChannel World Wide Identifiers
 		return fmt.Sprintf("%v", volumeSource.WWIDs), nil