Change:
Inline CSI volumes that are embedded in Pod specs still trigger all volume operation stages (attach, device mount, mount). Similar to plugin.CanAttach, a new plugin-wide method should be able to turn device mount off when the source is ephemeral volume. References See volume mount operation : This issue will use code from
/sig storage /assign
This will use work from

Discussion:
"csi_drivers_store_test.go", "csi_mounter_test.go", "csi_plugin_test.go", <ins> "csi_test.go", </ins> "csi_util_test.go", "expander_test.go", ],

return !skipAttach, nil } <del> // TODO (#75352) add proper logic to determine device moutability by inspecting the spec. </del> <ins> // CanDeviceMount returns true if the spec supports device mount </ins> func (p *csiPlugin) CanDeviceMount(spec *volume.Spec) (bool, error) { <ins> driverMode, err := p.getDriverMode(spec) if err != nil { return false, err } if driverMode == ephemeralDriverMode { klog.V(5).Info(log("plugin.CanDeviceMount skipped ephemeral mode detected for spec %v", spec.Name())) return false, nil } </ins> return true, nil }

} } <ins> func TestPluginCanDeviceMount(t *testing.T) { defer utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIInlineVolume, true)() tests := []struct { name           string driverName     string spec           *volume.Spec canDeviceMount bool shouldFail     bool }{ { name:           "non device mountable inline", driverName:     "inline-driver", spec:           volume.NewSpecFromVolume(makeTestVol("test-vol", "inline-driver")), canDeviceMount: false, }, { name:           "device mountable PV", driverName:     "device-mountable-pv", spec:           volume.NewSpecFromPersistentVolume(makeTestPV("test-vol", 20, "device-mountable-pv", testVol), true), canDeviceMount: true, }, { name:           "incomplete spec", driverName:     "device-unmountable", spec:           &volume.Spec{ReadOnly: true}, canDeviceMount: false, shouldFail:     true, }, { name:           "missing spec", driverName:     "device-unmountable", canDeviceMount: false, shouldFail:     true, }, } for _, test := range tests { t.Run(test.name, func(t *testing.T) { plug, tmpDir := newTestPlugin(t, nil) defer os.RemoveAll(tmpDir) pluginCanDeviceMount, err := plug.CanDeviceMount(test.spec) if err != nil && !test.shouldFail { t.Fatalf("unexpected error in plug.CanDeviceMount: %s", err) } if pluginCanDeviceMount != test.canDeviceMount { t.Fatalf("expecting plugin.CanAttach %t got %t", test.canDeviceMount, pluginCanDeviceMount) } }) } } func TestPluginFindDeviceMountablePluginBySpec(t *testing.T) { defer utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIInlineVolume, true)() tests := []struct { name           string driverName     string spec           *volume.Spec canDeviceMount bool shouldFail     bool }{ { name:           "non device mountable inline", driverName:     "inline-driver", spec:           volume.NewSpecFromVolume(makeTestVol("test-vol", "inline-driver")), canDeviceMount: false, }, { name:           "device mountable PV", driverName:     "device-mountable-pv", spec:           volume.NewSpecFromPersistentVolume(makeTestPV("test-vol", 20, "device-mountable-pv", testVol), true), canDeviceMount: true, }, { name:           "incomplete spec", driverName:     "device-unmountable", spec:           &volume.Spec{ReadOnly: true}, canDeviceMount: false, shouldFail:     true, }, { name:           "missing spec", driverName:     "device-unmountable", canDeviceMount: false, shouldFail:     true, }, } for _, test := range tests { t.Run(test.name, func(t *testing.T) { tmpDir, err := utiltesting.MkTmpdir("csi-test") if err != nil { t.Fatalf("can't create temp dir: %v", err) } defer os.RemoveAll(tmpDir) client := fakeclient.NewSimpleClientset() host := volumetest.NewFakeVolumeHost(tmpDir, client, nil) plugMgr := &volume.VolumePluginMgr{} plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, host) plug, err := plugMgr.FindDeviceMountablePluginBySpec(test.spec) if err != nil && !test.shouldFail { t.Fatalf("unexpected error in plugMgr.FindDeviceMountablePluginBySpec: %s", err) } if (plug != nil) != test.canDeviceMount { t.Fatalf("expecting deviceMountablePlugin, but got nil") } }) } } </ins> func TestPluginNewBlockMapper(t *testing.T) { defer utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIBlockVolume, true)()

<ins> /* Copyright 2019 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ package csi import ( "fmt" "math/rand" "os" "path" "path/filepath" "testing" "time" api "k8s.io/api/core/v1" storage "k8s.io/api/storage/v1" meta "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeaturetesting "k8s.io/apiserver/pkg/util/feature/testing" "k8s.io/client-go/informers" fakeclient "k8s.io/client-go/kubernetes/fake" utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/volume" volumetest "k8s.io/kubernetes/pkg/volume/testing" ) // TestCSI_VolumeAll runs a close approximation of volume workflow // based on operations from the volume manager/reconciler/operation executor func TestCSI_VolumeAll(t *testing.T) { defer utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIInlineVolume, true)() tests := []struct { name       string specName   string driver     string volName    string specFunc   func(specName, driver, volName string) *volume.Spec podFunc    func() *api.Pod isInline   bool shouldFail bool }{ { name:     "PersistentVolume", specName: "pv2", driver:   "simple-driver", volName:  "vol2", specFunc: func(specName, driver, volName string) *volume.Spec { return volume.NewSpecFromPersistentVolume(makeTestPV(specName, 20, driver, volName), false) }, podFunc: func() *api.Pod { podUID := types.UID(fmt.Sprintf("%08X", rand.Uint64())) return &api.Pod{ObjectMeta: meta.ObjectMeta{UID: podUID, Namespace: testns}} }, }, { name:    "ephermeral inline", driver:  "inline-driver-1", volName: "test.vol2", specFunc: func(specName, driver, volName string) *volume.Spec { return volume.NewSpecFromVolume(makeTestVol(specName, driver)) }, podFunc: func() *api.Pod { podUID := types.UID(fmt.Sprintf("%08X", rand.Uint64())) return &api.Pod{ObjectMeta: meta.ObjectMeta{UID: podUID, Namespace: testns}} }, isInline: true, }, { name:     "missing spec", specName: "pv2", driver:   "simple-driver", volName:  "vol2", specFunc: func(specName, driver, volName string) *volume.Spec { return nil }, podFunc: func() *api.Pod { podUID := types.UID(fmt.Sprintf("%08X", rand.Uint64())) return &api.Pod{ObjectMeta: meta.ObjectMeta{UID: podUID, Namespace: testns}} }, shouldFail: true, }, { name:     "incompete spec", specName: "pv2", driver:   "simple-driver", volName:  "vol2", specFunc: func(specName, driver, volName string) *volume.Spec { return &volume.Spec{ReadOnly: true} }, podFunc: func() *api.Pod { podUID := types.UID(fmt.Sprintf("%08X", rand.Uint64())) return &api.Pod{ObjectMeta: meta.ObjectMeta{UID: podUID, Namespace: testns}} }, shouldFail: true, }, } for _, test := range tests { t.Run(test.name, func(t *testing.T) { tmpDir, err := utiltesting.MkTmpdir("csi-test") if err != nil { t.Fatalf("can't create temp dir: %v", err) } defer os.RemoveAll(tmpDir) client := fakeclient.NewSimpleClientset() fakeWatcher := watch.NewRaceFreeFake() factory := informers.NewSharedInformerFactory(client, csiResyncPeriod) go factory.Start(wait.NeverStop) host := volumetest.NewFakeVolumeHostWithCSINodeName( tmpDir, client, nil, "csi-node", factory.Storage().V1beta1().CSIDrivers().Lister(), ) plugMgr := &volume.VolumePluginMgr{} plugMgr.InitPlugins(ProbeVolumePlugins(), nil /* prober */, host) csiClient := setupClient(t, true) volSpec := test.specFunc(test.specName, test.driver, test.volName) pod := test.podFunc() attachName := getAttachmentName(test.volName, test.driver, string(host.GetNodeName())) t.Log("csiTest.VolumeAll starting...") // *************** Attach/Mount volume resources ****************// // attach volume t.Log("csiTest.VolumeAll Attaching volume...") attachPlug, err := plugMgr.FindAttachablePluginBySpec(volSpec) if err != nil { if !test.shouldFail { t.Fatalf("csiTest.VolumeAll PluginManager.FindAttachablePluginBySpec failed: %v", err) } else { t.Log("csiTest.VolumeAll failed: ", err) return } } if test.isInline && attachPlug != nil { t.Fatal("csiTest.VolumeAll AttachablePlugin found with ephemeral volume") } if !test.isInline && attachPlug == nil { t.Fatal("csiTest.VolumeAll AttachablePlugin not found with PV") } var devicePath string if attachPlug != nil { t.Log("csiTest.VolumeAll attacher.Attach starting") var volAttacher volume.Attacher volAttacher, err := attachPlug.NewAttacher() if err != nil { t.Fatal("csiTest.VolumeAll failed to create new attacher: ", err) } // creates VolumeAttachment and blocks until it is marked attached (done by external attacher) go func(spec *volume.Spec, nodeName types.NodeName) { attachID, err := volAttacher.Attach(spec, nodeName) if err != nil { t.Fatalf("csiTest.VolumeAll attacher.Attach failed: %s", err) } t.Logf("csiTest.VolumeAll got attachID %s", attachID) }(volSpec, host.GetNodeName()) // Simulates external-attacher and marks VolumeAttachment.Status.Attached = true markVolumeAttached(t, host.GetKubeClient(), fakeWatcher, attachName, storage.VolumeAttachmentStatus{Attached: true}) devicePath, err = volAttacher.WaitForAttach(volSpec, "", pod, 500*time.Millisecond) if err != nil { t.Fatal("csiTest.VolumeAll attacher.WaitForAttach failed:", err) } if devicePath != attachName { t.Fatalf("csiTest.VolumeAll attacher.WaitForAttach got unexpected value %s", devicePath) } t.Log("csiTest.VolumeAll attacher.WaitForAttach succeeded OK, attachment ID:", devicePath) } else { t.Log("csiTest.VolumeAll volume attacher not found, skipping attachment") } // Mount Device t.Log("csiTest.VolumeAll Mouting device...") devicePlug, err := plugMgr.FindDeviceMountablePluginBySpec(volSpec) if err != nil { t.Fatalf("csiTest.VolumeAll PluginManager.FindDeviceMountablePluginBySpec failed: %v", err) } if test.isInline && devicePlug != nil { t.Fatal("csiTest.VolumeAll DeviceMountablePlugin found with ephemeral volume") } if !test.isInline && devicePlug == nil { t.Fatal("csiTest.VolumeAll DeviceMountablePlugin not found with PV") } var devMounter volume.DeviceMounter if devicePlug != nil { devMounter, err = devicePlug.NewDeviceMounter() if err != nil { t.Fatal("csiTest.VolumeAll failed to create new device mounter: ", err) } } if devMounter != nil { csiDevMounter := devMounter.(*csiAttacher) csiDevMounter.csiClient = csiClient devMountPath, err := csiDevMounter.GetDeviceMountPath(volSpec) if err != nil { t.Fatalf("csiTest.VolumeAll deviceMounter.GetdeviceMountPath failed %s", err) } if err := csiDevMounter.MountDevice(volSpec, devicePath, devMountPath); err != nil { t.Fatalf("csiTest.VolumeAll deviceMounter.MountDevice failed: %v", err) } t.Log("csiTest.VolumeAll device mounted at path:", devMountPath) } else { t.Log("csiTest.VolumeAll DeviceMountablePlugin not found, skipping deviceMounter.MountDevice") } // mount volume t.Log("csiTest.VolumeAll Mouting volume...") volPlug, err := plugMgr.FindPluginBySpec(volSpec) if err != nil || volPlug == nil { t.Fatalf("csiTest.VolumeAll PluginMgr.FindPluginBySpec failed: %v", err) } if volPlug == nil { t.Fatalf("csiTest.VolumeAll volumePlugin is nil") } if !volPlug.CanSupport(volSpec) { t.Fatal("csiTest.VolumeAll volumePlugin.CanSupport returned false") } mounter, err := volPlug.NewMounter(volSpec, pod, volume.VolumeOptions{}) if err != nil || mounter == nil { t.Fatalf("csiTest.VolumeAll volPlugin.NewMounter is nil or error: %s", err) } if err := mounter.CanMount(); err != nil { t.Fatal("csiTest.VolumeAll mounter.CanMount failed, skipping mount") } var fsGroup *int64 if pod.Spec.SecurityContext != nil && pod.Spec.SecurityContext.FSGroup != nil { fsGroup = pod.Spec.SecurityContext.FSGroup } csiMounter := mounter.(*csiMountMgr) csiMounter.csiClient = csiClient if err := csiMounter.SetUp(fsGroup); err != nil { t.Fatalf("csiTest.VolumeAll mounter.Setup(fsGroup) failed: %s", err) } t.Log("csiTest.VolumeAll mounter.Setup(fsGroup) done OK") dataFile := filepath.Join(path.Dir(mounter.GetPath()), volDataFileName) if _, err := os.Stat(dataFile); err != nil { t.Fatalf("csiTest.VolumeAll meatadata JSON file not found: %s", dataFile) } t.Log("csiTest.VolumeAll JSON datafile generated OK:", dataFile) // ******** Volume Reconstruction ************* // volPath := path.Dir(csiMounter.GetPath()) t.Log("csiTest.VolumeAll entering plugin.ConstructVolumeSpec for path", volPath) spec, err := volPlug.ConstructVolumeSpec(test.volName, volPath) if err != nil { t.Fatalf("csiTest.VolumeAll plugin.ConstructVolumeSpec failed: %s", err) } else { if spec == nil { t.Fatalf("csiTest.VolumeAll plugin.ConstructVolumeSpec returned nil spec") } else { volSpec = spec if test.isInline { if volSpec.Volume == nil || volSpec.Volume.CSI == nil { t.Fatal("csiTest.VolumeAll reconstruction of ephemeral volumeSpec missing CSI Volume source") } if volSpec.Volume.CSI.Driver == "" { t.Fatal("csiTest.VolumeAll reconstruction ephemral volume missing driver name") } } else { if volSpec.PersistentVolume == nil || volSpec.PersistentVolume.Spec.CSI == nil { t.Fatal("csiTest.VolumeAll reconstruction of volumeSpec missing CSI PersistentVolume source") } csi := volSpec.PersistentVolume.Spec.CSI if csi.Driver == "" { t.Fatal("csiTest.VolumeAll reconstruction of PV missing driver name") } if csi.VolumeHandle == "" { t.Fatal("csiTest.VolumeAll reconstruction of PV missing volume handle") } } } } // ************* Teardown everything **************** // t.Log("csiTest.VolumeAll Tearing down...") // unmount volume t.Log("csiTest.VolumeAll Unmouting volume...") volPlug, err = plugMgr.FindPluginBySpec(volSpec) if err != nil || volPlug == nil { t.Fatalf("csiTest.VolumeAll PluginMgr.FindPluginBySpec failed: %v", err) } if volPlug == nil { t.Fatalf("csiTest.VolumeAll volumePlugin is nil") } mounter, err = volPlug.NewMounter(volSpec, pod, volume.VolumeOptions{}) if err != nil || mounter == nil { t.Fatalf("csiTest.VolumeAll volPlugin.NewMounter is nil or error: %s", err) } unmounter, err := volPlug.NewUnmounter(test.specName, pod.GetUID()) if err != nil { t.Fatal("csiTest.VolumeAll volumePlugin.NewUnmounter failed:", err) } csiUnmounter := unmounter.(*csiMountMgr) csiUnmounter.csiClient = csiClient if err := csiUnmounter.TearDownAt(mounter.GetPath()); err != nil { t.Fatal("csiTest.VolumeAll unmounter.TearDownAt failed:", err) } t.Log("csiTest.VolumeAll unmounter.TearDownAt done OK for dir:", mounter.GetPath()) // unmount device t.Log("csiTest.VolumeAll Unmouting device...") devicePlug, err = plugMgr.FindDeviceMountablePluginBySpec(volSpec) if err != nil { t.Fatalf("csiTest.VolumeAll failed to create mountable device plugin: %s", err) } if test.isInline && devicePlug != nil { t.Fatal("csiTest.VolumeAll DeviceMountablePlugin found with ephemeral volume") } if !test.isInline && devicePlug == nil { t.Fatal("csiTest.VolumeAll DeviceMountablePlugin not found with PV") } var devUnmounter volume.DeviceUnmounter if devicePlug != nil { t.Log("csiTest.VolumeAll found DeviceMountablePlugin, entering device unmouting ...") devMounter, err = devicePlug.NewDeviceMounter() if err != nil { t.Fatal("csiTest.VolumeAll failed to create new device mounter: ", err) } devUnmounter, err = devicePlug.NewDeviceUnmounter() if err != nil { t.Fatal("csiTest.VolumeAll failed to create new device unmounter: ", err) } if devMounter != nil && devUnmounter != nil { csiDevMounter := devMounter.(*csiAttacher) csiDevUnmounter := devUnmounter.(*csiAttacher) csiDevUnmounter.csiClient = csiClient devMountPath, err := csiDevMounter.GetDeviceMountPath(volSpec) if err != nil { t.Fatalf("csiTest.VolumeAll deviceMounter.GetdeviceMountPath failed %s", err) } if err := csiDevUnmounter.UnmountDevice(devMountPath); err != nil { t.Fatalf("csiTest.VolumeAll deviceMounter.UnmountDevice failed: %s", err) } t.Log("csiTest.VolumeAll deviceUmounter.UnmountDevice done OK for path", devMountPath) } } else { t.Log("csiTest.VolumeAll DeviceMountablePluginBySpec did not find a plugin, skipping unmounting.") } // detach volume t.Log("csiTest.VolumeAll Detaching volume...") attachPlug, err = plugMgr.FindAttachablePluginBySpec(volSpec) if err != nil { t.Fatalf("csiTest.VolumeAll PluginManager.FindAttachablePluginBySpec failed: %v", err) } if test.isInline && attachPlug != nil { t.Fatal("csiTest.VolumeAll AttachablePlugin found with ephemeral volume") } if !test.isInline && attachPlug == nil { t.Fatal("csiTest.VolumeAll AttachablePlugin not found with PV") } if attachPlug != nil { volDetacher, err := attachPlug.NewDetacher() if err != nil { t.Fatal("csiTest.VolumeAll failed to create new detacher: ", err) } t.Log("csiTest.VolumeAll preparing detacher.Detach...") volName, err := volPlug.GetVolumeName(volSpec) if err != nil { t.Fatal("csiTest.VolumeAll volumePlugin.GetVolumeName failed:", err) } csiDetacher := volDetacher.(*csiAttacher) csiDetacher.csiClient = csiClient if err := csiDetacher.Detach(volName, host.GetNodeName()); err != nil { t.Fatal("csiTest.VolumeAll detacher.Detach failed:", err) } t.Log("csiTest.VolumeAll detacher.Detach succeeded for volume", volName) } else { t.Log("csiTest.VolumeAll attachable plugin not found for plugin.Detach call, skipping") } }) } } </ins>