mirror of
https://github.com/optim-enterprises-bv/kubernetes.git
synced 2025-12-03 23:03:53 +00:00
storage: move the APIObjectVersioner definition to storage
The means by which we extract and parse the version of an API object is not specific to etcd3. In order to allow for a generic suite of tests against any storage.Interface imlpementation, we need this logic to live outside of the etcd3 package, or import cycles will exist. Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
This commit is contained in:
@@ -29,7 +29,7 @@ import (
|
||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||
"k8s.io/apimachinery/pkg/util/sets"
|
||||
"k8s.io/apimachinery/pkg/watch"
|
||||
"k8s.io/apiserver/pkg/storage/etcd3"
|
||||
"k8s.io/apiserver/pkg/storage"
|
||||
"k8s.io/client-go/dynamic"
|
||||
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
|
||||
)
|
||||
@@ -119,11 +119,14 @@ func TestCrossGroupStorage(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
versioner := etcd3.APIObjectVersioner{}
|
||||
versioner := storage.APIObjectVersioner{}
|
||||
for _, resource := range resources {
|
||||
// clear out the things cleared in etcd
|
||||
versioned := versionedData[resource.Mapping.Resource]
|
||||
versioner.PrepareObjectForStorage(versioned)
|
||||
if err := versioner.PrepareObjectForStorage(versioned); err != nil {
|
||||
t.Error(err)
|
||||
continue
|
||||
}
|
||||
versionedJSON, err := versioned.MarshalJSON()
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
|
||||
Reference in New Issue
Block a user