github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-21 09:57:52 +00:00
Code Issues Projects Releases Wiki Activity

Detect change of volume attachability in the middle of attaching

Browse Source 
- Add Unit tests for both volumemanager and attach/detach controller
- Add E2E test
This commit is contained in:
Jiawei Wang
2020-08-04 23:11:00 -07:00
parent ec560b9737
commit a6d8e6c5c2
11 changed files with 374 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/volume/testing/testing.go
View File

@@ -381,6 +381,9 @@ type FakeVolumePlugin struct {
ProvisionDelaySeconds int
SupportsRemount bool
// default to false which means it is attachable by default
NonAttachable bool
// Add callbacks as needed
WaitForAttachHook func(spec *Spec, devicePath string, pod *v1.Pod, spectimeout time.Duration) (string, error)
UnmountDeviceHook func(globalMountPath string) error
@@ -444,6 +447,8 @@ func (plugin *FakeVolumePlugin) GetVolumeName(spec *Spec) (string, error) {
} else if spec.PersistentVolume != nil &&
spec.PersistentVolume.Spec.GCEPersistentDisk != nil {
volumeName = spec.PersistentVolume.Spec.GCEPersistentDisk.PDName
} else if spec.Volume != nil && spec.Volume.CSI != nil {
volumeName = spec.Volume.CSI.Driver
}
if volumeName == "" {
volumeName = spec.Name()
@@ -604,7 +609,7 @@ func (plugin *FakeVolumePlugin) GetNewDetacherCallCount() int {
}
func (plugin *FakeVolumePlugin) CanAttach(spec *Spec) (bool, error) {
return true, nil
return !plugin.NonAttachable, nil
}
func (plugin *FakeVolumePlugin) CanDeviceMount(spec *Spec) (bool, error) {