github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #96599 from tanjing2020/master

Browse Source 
fix staticcheck:pkg/volume/testing
This commit is contained in:
Kubernetes Prow Robot 2021-01-28 18:43:40 -08:00 committed by GitHub
commit 125a5f10a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.staticcheck_failures
View File

@ -1,7 +1,6 @@
cluster/images/etcd/migrate cluster/images/etcd/migrate
pkg/controller/replicaset pkg/controller/replicaset
pkg/kubelet/dockershim pkg/kubelet/dockershim
pkg/volume/testing
test/e2e/autoscaling test/e2e/autoscaling
test/integration/examples test/integration/examples
test/integration/framework test/integration/framework

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

@ -201,14 +201,16 @@ var _ DeviceMountableVolumePlugin = &FakeVolumePlugin{}
var _ NodeExpandableVolumePlugin = &FakeVolumePlugin{} var _ NodeExpandableVolumePlugin = &FakeVolumePlugin{}
func (plugin *FakeVolumePlugin) getFakeVolume(list *[]*FakeVolume) *FakeVolume { func (plugin *FakeVolumePlugin) getFakeVolume(list *[]*FakeVolume) *FakeVolume {
volumeList := *list if list != nil {
if list != nil && len(volumeList) > 0 { volumeList := *list
volume := volumeList[0] if len(volumeList) > 0 {
volume.Lock() volume := volumeList[0]
defer volume.Unlock() volume.Lock()
volume.WaitForAttachHook = plugin.WaitForAttachHook defer volume.Unlock()
volume.UnmountDeviceHook = plugin.UnmountDeviceHook volume.WaitForAttachHook = plugin.WaitForAttachHook
return volume volume.UnmountDeviceHook = plugin.UnmountDeviceHook
return volume
}
} }
volume := &FakeVolume{ volume := &FakeVolume{
WaitForAttachHook: plugin.WaitForAttachHook, WaitForAttachHook: plugin.WaitForAttachHook,
@ -217,7 +219,9 @@ func (plugin *FakeVolumePlugin) getFakeVolume(list *[]*FakeVolume) *FakeVolume {
volume.VolumesAttached = make(map[string]sets.String) volume.VolumesAttached = make(map[string]sets.String)
volume.DeviceMountState = make(map[string]string) volume.DeviceMountState = make(map[string]string)
volume.VolumeMountState = make(map[string]string) volume.VolumeMountState = make(map[string]string)
*list = append(*list, volume) if list != nil {
*list = append(*list, volume)
}
return volume return volume
} }