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

Merge pull request #12001 from uluyol/os-exp-hack

Browse Source 
Add (stopgap) support for an experimental API prefix.
This commit is contained in:
Mike Danese
2015-07-31 10:15:06 -07:00
parent c752bc6ffb 58a875ac2c
commit e58ea24d0b
31 changed files with 529 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/volume/persistent_claim/persistent_claim_test.go
View File

@@ -23,7 +23,6 @@ import (
"testing"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient"
"github.com/GoogleCloudPlatform/kubernetes/pkg/types"
@@ -238,7 +237,7 @@ func TestNewBuilder(t *testing.T) {
o := testclient.NewObjects(api.Scheme, api.Scheme)
o.Add(item.pv)
o.Add(item.claim)
client := &testclient.Fake{ReactFn: testclient.ObjectReaction(o, latest.RESTMapper)}
client := &testclient.Fake{ReactFn: testclient.ObjectReaction(o, api.RESTMapper)}
plugMgr := volume.VolumePluginMgr{}
plugMgr.InitPlugins(testProbeVolumePlugins(), newTestHost(t, client))
@@ -295,7 +294,7 @@ func TestNewBuilderClaimNotBound(t *testing.T) {
o := testclient.NewObjects(api.Scheme, api.Scheme)
o.Add(pv)
o.Add(claim)
client := &testclient.Fake{ReactFn: testclient.ObjectReaction(o, latest.RESTMapper)}
client := &testclient.Fake{ReactFn: testclient.ObjectReaction(o, api.RESTMapper)}
plugMgr := volume.VolumePluginMgr{}
plugMgr.InitPlugins(testProbeVolumePlugins(), newTestHost(t, client))