github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add PV.Name into names of generated GCE/AWS/OSP volumes.

Browse Source 
Volume names have now format <cluster-name>-dynamic-<pv-name>.

pv-name is guaranteed to be unique in Kubernetes cluster, adding
<cluster-name> ensures we don't conflict with any running cluster
in the cloud project (kube-controller-manager --cluster-name=XXX).

'kubernetes' is the default cluster name.
This commit is contained in:
Jan Safranek
2016-02-12 09:46:59 +01:00
parent b5c12d10b8
commit 1d0b1c227b
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
}