github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20900 from jsafrane/devel/volume-names

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-13 17:58:29 -08:00
parent 3b4c0beb99 1d0b1c227b
commit 315a509340
12 changed files with 86 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/persistentvolume/persistentvolume_provisioner_controller_test.go
View File

@@ -95,7 +95,7 @@ func makeTestClaim() *api.PersistentVolumeClaim {
func makeTestController() (*PersistentVolumeProvisionerController, *mockControllerClient, *volume.FakeVolumePlugin) {
mockClient := &mockControllerClient{}
mockVolumePlugin := &volume.FakeVolumePlugin{}
controller, _ := NewPersistentVolumeProvisionerController(mockClient, 1*time.Second, nil, mockVolumePlugin, &fake_cloud.FakeCloud{})
controller, _ := NewPersistentVolumeProvisionerController(mockClient, 1*time.Second, "fake-kubernetes", nil, mockVolumePlugin, &fake_cloud.FakeCloud{})
return controller, mockClient, mockVolumePlugin
}