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

Merge pull request #12508 from markturansky/refactor_pv_controllers

Browse Source 
Refactored persistent volume controllers to new packaging structure
This commit is contained in:
Filip Grzadkowski
2015-08-11 12:35:23 +02:00
parent 999eff1b7f 8e0d391b1e
commit 44c91b1a39
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
pkg/volumeclaimbinder/persistent_volume_claim_binder.go → pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go
View File

10
pkg/volumeclaimbinder/persistent_volume_claim_binder_test.go → pkg/controller/persistentvolume/persistentvolume_claim_binder_controller_test.go
View File

@@ -114,7 +114,7 @@ func TestExampleObjects(t *testing.T) {
for name, scenario := range scenarios {
o := testclient.NewObjects(api.Scheme, api.Scheme)
if err := testclient.AddObjectsFromPath("../../docs/user-guide/persistent-volumes/"+name, o, api.Scheme); err != nil {
if err := testclient.AddObjectsFromPath("../../../docs/user-guide/persistent-volumes/"+name, o, api.Scheme); err != nil {
t.Fatal(err)
}
@@ -171,10 +171,10 @@ func TestExampleObjects(t *testing.T) {
func TestBindingWithExamples(t *testing.T) {
api.ForTesting_ReferencesAllowBlankSelfLinks = true
o := testclient.NewObjects(api.Scheme, api.Scheme)
if err := testclient.AddObjectsFromPath("../../docs/user-guide/persistent-volumes/claims/claim-01.yaml", o, api.Scheme); err != nil {
if err := testclient.AddObjectsFromPath("../../../docs/user-guide/persistent-volumes/claims/claim-01.yaml", o, api.Scheme); err != nil {
t.Fatal(err)
}
if err := testclient.AddObjectsFromPath("../../docs/user-guide/persistent-volumes/volumes/local-01.yaml", o, api.Scheme); err != nil {
if err := testclient.AddObjectsFromPath("../../../docs/user-guide/persistent-volumes/volumes/local-01.yaml", o, api.Scheme); err != nil {
t.Fatal(err)
}
@@ -274,10 +274,10 @@ func TestBindingWithExamples(t *testing.T) {
func TestMissingFromIndex(t *testing.T) {
api.ForTesting_ReferencesAllowBlankSelfLinks = true
o := testclient.NewObjects(api.Scheme, api.Scheme)
if err := testclient.AddObjectsFromPath("../../docs/user-guide/persistent-volumes/claims/claim-01.yaml", o, api.Scheme); err != nil {
if err := testclient.AddObjectsFromPath("../../../docs/user-guide/persistent-volumes/claims/claim-01.yaml", o, api.Scheme); err != nil {
t.Fatal(err)
}
if err := testclient.AddObjectsFromPath("../../docs/user-guide/persistent-volumes/volumes/local-01.yaml", o, api.Scheme); err != nil {
if err := testclient.AddObjectsFromPath("../../../docs/user-guide/persistent-volumes/volumes/local-01.yaml", o, api.Scheme); err != nil {
t.Fatal(err)
}

0
pkg/volumeclaimbinder/persistent_volume_index_test.go → pkg/controller/persistentvolume/persistentvolume_index_test.go
View File

0
pkg/volumeclaimbinder/persistent_volume_recycler.go → pkg/controller/persistentvolume/persistentvolume_recycler_controller.go
View File

0
pkg/volumeclaimbinder/types.go → pkg/controller/persistentvolume/types.go
View File