Merge pull request #1969 from smarterclayton/new_typemeta

Allow Meta lookup to work across ObjectType and ListMeta
This commit is contained in:
Daniel Smith
2014-10-23 15:29:57 -07:00
19 changed files with 719 additions and 469 deletions

View File

@@ -25,6 +25,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta"
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/coreos/go-etcd/etcd"
@@ -44,7 +45,7 @@ func (*TestResource) IsAnAPIObject() {}
var scheme *runtime.Scheme
var codec runtime.Codec
var versioner = RuntimeVersionAdapter{runtime.NewTypeMetaResourceVersioner()}
var versioner = RuntimeVersionAdapter{meta.NewResourceVersioner()}
func init() {
scheme = runtime.NewScheme()