github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix references from serializable types to use v1.ObjectMeta

Browse Source
This commit is contained in:
Jordan Liggitt 2016-12-08 16:26:04 -05:00
parent 711986876b
commit fcf5bbccd6
No known key found for this signature in database
GPG Key ID: 24E7ADF9A3B42012
12 changed files with 67 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.generated.go
View File

@ -25,7 +25,7 @@ import (
"errors" "errors"
"fmt" "fmt"
codec1978 "github.com/ugorji/go/codec" codec1978 "github.com/ugorji/go/codec"
pkg2_api "k8s.io/kubernetes/pkg/api" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1"
pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1"
pkg3_types "k8s.io/kubernetes/pkg/types" pkg3_types "k8s.io/kubernetes/pkg/types"
"reflect" "reflect"
@ -63,7 +63,7 @@ func init() {
panic(err) panic(err)
} }
if false { // reference the types, but skip this branch at build/run time if false { // reference the types, but skip this branch at build/run time
var v0 pkg2_api.ObjectMeta var v0 pkg2_v1.ObjectMeta
var v1 pkg1_v1.TypeMeta var v1 pkg1_v1.TypeMeta
var v2 pkg3_types.UID var v2 pkg3_types.UID
var v3 time.Time var v3 time.Time
@ -264,7 +264,7 @@ func (x *TestType) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
case "metadata": case "metadata":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_api.ObjectMeta{} x.ObjectMeta = pkg2_v1.ObjectMeta{}
} else { } else {
yyv20 := &x.ObjectMeta yyv20 := &x.ObjectMeta
yyv20.CodecDecodeSelf(d) yyv20.CodecDecodeSelf(d)
@ -334,7 +334,7 @@ func (x *TestType) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_api.ObjectMeta{} x.ObjectMeta = pkg2_v1.ObjectMeta{}
} else { } else {
yyv25 := &x.ObjectMeta yyv25 := &x.ObjectMeta
yyv25.CodecDecodeSelf(d) yyv25.CodecDecodeSelf(d)

4
cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.go
View File

@ -17,7 +17,7 @@ limitations under the License.
package v1 package v1
import ( import (
"k8s.io/kubernetes/pkg/api" apiv1 "k8s.io/kubernetes/pkg/api/v1"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
) )
@ -30,7 +30,7 @@ type TestType struct {
// unversioned objects in the generate file that is not used anywhere other than this test type. // unversioned objects in the generate file that is not used anywhere other than this test type.
// +k8s:openapi-gen=false // +k8s:openapi-gen=false
// +optional // +optional
api.ObjectMeta `json:"metadata,omitempty"` apiv1.ObjectMeta `json:"metadata,omitempty"`
// +optional // +optional
Status TestTypeStatus `json:"status,omitempty"` Status TestTypeStatus `json:"status,omitempty"`
} }

29
pkg/apiserver/apiserver_test.go
View File

@ -39,6 +39,7 @@ import (
"k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/rest"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/apiserver/filters" "k8s.io/kubernetes/pkg/apiserver/filters"
"k8s.io/kubernetes/pkg/apiserver/request" "k8s.io/kubernetes/pkg/apiserver/request"
@ -317,7 +318,7 @@ func handleInternal(storage map[string]rest.Storage, admissionControl admission.
} }
func TestSimpleSetupRight(t *testing.T) { func TestSimpleSetupRight(t *testing.T) {
s := &apiservertesting.Simple{ObjectMeta: api.ObjectMeta{Name: "aName"}} s := &apiservertesting.Simple{ObjectMeta: apiv1.ObjectMeta{Name: "aName"}}
wire, err := runtime.Encode(codec, s) wire, err := runtime.Encode(codec, s)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -470,7 +471,7 @@ func (storage *SimpleRESTStorage) Delete(ctx api.Context, id string, options *ap
var obj runtime.Object = &metav1.Status{Status: metav1.StatusSuccess} var obj runtime.Object = &metav1.Status{Status: metav1.StatusSuccess}
var err error var err error
if storage.injectedFunction != nil { if storage.injectedFunction != nil {
obj, err = storage.injectedFunction(&apiservertesting.Simple{ObjectMeta: api.ObjectMeta{Name: id}}) obj, err = storage.injectedFunction(&apiservertesting.Simple{ObjectMeta: apiv1.ObjectMeta{Name: id}})
} }
return obj, err return obj, err
} }
@ -1119,7 +1120,7 @@ func TestNonEmptyList(t *testing.T) {
simpleStorage := SimpleRESTStorage{ simpleStorage := SimpleRESTStorage{
list: []apiservertesting.Simple{ list: []apiservertesting.Simple{
{ {
ObjectMeta: api.ObjectMeta{Name: "something", Namespace: "other"}, ObjectMeta: apiv1.ObjectMeta{Name: "something", Namespace: "other"},
Other: "foo", Other: "foo",
}, },
}, },
@ -1170,7 +1171,7 @@ func TestSelfLinkSkipsEmptyName(t *testing.T) {
simpleStorage := SimpleRESTStorage{ simpleStorage := SimpleRESTStorage{
list: []apiservertesting.Simple{ list: []apiservertesting.Simple{
{ {
ObjectMeta: api.ObjectMeta{Namespace: "other"}, ObjectMeta: apiv1.ObjectMeta{Namespace: "other"},
Other: "foo", Other: "foo",
}, },
}, },
@ -1244,7 +1245,7 @@ func TestExport(t *testing.T) {
storage := map[string]rest.Storage{} storage := map[string]rest.Storage{}
simpleStorage := SimpleRESTStorage{ simpleStorage := SimpleRESTStorage{
item: apiservertesting.Simple{ item: apiservertesting.Simple{
ObjectMeta: api.ObjectMeta{ ObjectMeta: apiv1.ObjectMeta{
ResourceVersion: "1234", ResourceVersion: "1234",
CreationTimestamp: metav1.NewTime(time.Unix(10, 10)), CreationTimestamp: metav1.NewTime(time.Unix(10, 10)),
}, },
@ -2177,7 +2178,7 @@ func TestPatch(t *testing.T) {
storage := map[string]rest.Storage{} storage := map[string]rest.Storage{}
ID := "id" ID := "id"
item := &apiservertesting.Simple{ item := &apiservertesting.Simple{
ObjectMeta: api.ObjectMeta{ ObjectMeta: apiv1.ObjectMeta{
Name: ID, Name: ID,
Namespace: "", // update should allow the client to send an empty namespace Namespace: "", // update should allow the client to send an empty namespace
UID: "uid", UID: "uid",
@ -2216,7 +2217,7 @@ func TestPatchRequiresMatchingName(t *testing.T) {
storage := map[string]rest.Storage{} storage := map[string]rest.Storage{}
ID := "id" ID := "id"
item := &apiservertesting.Simple{ item := &apiservertesting.Simple{
ObjectMeta: api.ObjectMeta{ ObjectMeta: apiv1.ObjectMeta{
Name: ID, Name: ID,
Namespace: "", // update should allow the client to send an empty namespace Namespace: "", // update should allow the client to send an empty namespace
UID: "uid", UID: "uid",
@ -2257,7 +2258,7 @@ func TestUpdate(t *testing.T) {
defer server.Close() defer server.Close()
item := &apiservertesting.Simple{ item := &apiservertesting.Simple{
ObjectMeta: api.ObjectMeta{ ObjectMeta: apiv1.ObjectMeta{
Name: ID, Name: ID,
Namespace: "", // update should allow the client to send an empty namespace Namespace: "", // update should allow the client to send an empty namespace
}, },
@ -2294,7 +2295,7 @@ func TestUpdateInvokesAdmissionControl(t *testing.T) {
defer server.Close() defer server.Close()
item := &apiservertesting.Simple{ item := &apiservertesting.Simple{
ObjectMeta: api.ObjectMeta{ ObjectMeta: apiv1.ObjectMeta{
Name: ID, Name: ID,
Namespace: api.NamespaceDefault, Namespace: api.NamespaceDefault,
}, },
@ -2356,7 +2357,7 @@ func TestUpdateAllowsMissingNamespace(t *testing.T) {
defer server.Close() defer server.Close()
item := &apiservertesting.Simple{ item := &apiservertesting.Simple{
ObjectMeta: api.ObjectMeta{ ObjectMeta: apiv1.ObjectMeta{
Name: ID, Name: ID,
}, },
Other: "bar", Other: "bar",
@ -2393,7 +2394,7 @@ func TestUpdateAllowsMismatchedNamespaceOnError(t *testing.T) {
defer server.Close() defer server.Close()
item := &apiservertesting.Simple{ item := &apiservertesting.Simple{
ObjectMeta: api.ObjectMeta{ ObjectMeta: apiv1.ObjectMeta{
Name: ID, Name: ID,
Namespace: "other", // does not match request Namespace: "other", // does not match request
}, },
@ -2430,7 +2431,7 @@ func TestUpdatePreventsMismatchedNamespace(t *testing.T) {
defer server.Close() defer server.Close()
item := &apiservertesting.Simple{ item := &apiservertesting.Simple{
ObjectMeta: api.ObjectMeta{ ObjectMeta: apiv1.ObjectMeta{
Name: ID, Name: ID,
Namespace: "other", Namespace: "other",
}, },
@ -2465,7 +2466,7 @@ func TestUpdateMissing(t *testing.T) {
defer server.Close() defer server.Close()
item := &apiservertesting.Simple{ item := &apiservertesting.Simple{
ObjectMeta: api.ObjectMeta{ ObjectMeta: apiv1.ObjectMeta{
Name: ID, Name: ID,
Namespace: api.NamespaceDefault, Namespace: api.NamespaceDefault,
}, },
@ -3226,7 +3227,7 @@ func TestUpdateChecksAPIVersion(t *testing.T) {
defer server.Close() defer server.Close()
client := http.Client{} client := http.Client{}
simple := &apiservertesting.Simple{ObjectMeta: api.ObjectMeta{Name: "bar"}} simple := &apiservertesting.Simple{ObjectMeta: apiv1.ObjectMeta{Name: "bar"}}
data, err := runtime.Encode(newCodec, simple) data, err := runtime.Encode(newCodec, simple)
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)

12
pkg/apiserver/testing/types.generated.go
View File

@ -25,7 +25,7 @@ import (
"errors" "errors"
"fmt" "fmt"
codec1978 "github.com/ugorji/go/codec" codec1978 "github.com/ugorji/go/codec"
pkg2_api "k8s.io/kubernetes/pkg/api" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1"
pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1"
pkg3_types "k8s.io/kubernetes/pkg/types" pkg3_types "k8s.io/kubernetes/pkg/types"
"reflect" "reflect"
@ -63,7 +63,7 @@ func init() {
panic(err) panic(err)
} }
if false { // reference the types, but skip this branch at build/run time if false { // reference the types, but skip this branch at build/run time
var v0 pkg2_api.ObjectMeta var v0 pkg2_v1.ObjectMeta
var v1 pkg1_v1.TypeMeta var v1 pkg1_v1.TypeMeta
var v2 pkg3_types.UID var v2 pkg3_types.UID
var v3 time.Time var v3 time.Time
@ -299,7 +299,7 @@ func (x *Simple) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
case "metadata": case "metadata":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_api.ObjectMeta{} x.ObjectMeta = pkg2_v1.ObjectMeta{}
} else { } else {
yyv23 := &x.ObjectMeta yyv23 := &x.ObjectMeta
yyv23.CodecDecodeSelf(d) yyv23.CodecDecodeSelf(d)
@ -380,7 +380,7 @@ func (x *Simple) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_api.ObjectMeta{} x.ObjectMeta = pkg2_v1.ObjectMeta{}
} else { } else {
yyv30 := &x.ObjectMeta yyv30 := &x.ObjectMeta
yyv30.CodecDecodeSelf(d) yyv30.CodecDecodeSelf(d)
@ -667,7 +667,7 @@ func (x *SimpleRoot) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
case "metadata": case "metadata":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_api.ObjectMeta{} x.ObjectMeta = pkg2_v1.ObjectMeta{}
} else { } else {
yyv56 := &x.ObjectMeta yyv56 := &x.ObjectMeta
yyv56.CodecDecodeSelf(d) yyv56.CodecDecodeSelf(d)
@ -748,7 +748,7 @@ func (x *SimpleRoot) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_api.ObjectMeta{} x.ObjectMeta = pkg2_v1.ObjectMeta{}
} else { } else {
yyv63 := &x.ObjectMeta yyv63 := &x.ObjectMeta
yyv63.CodecDecodeSelf(d) yyv63.CodecDecodeSelf(d)

6
pkg/apiserver/testing/types.go
View File

@ -17,14 +17,14 @@ limitations under the License.
package testing package testing
import ( import (
"k8s.io/kubernetes/pkg/api" apiv1 "k8s.io/kubernetes/pkg/api/v1"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/runtime/schema"
) )
type Simple struct { type Simple struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
api.ObjectMeta `json:"metadata"` apiv1.ObjectMeta `json:"metadata"`
// +optional // +optional
Other string `json:"other,omitempty"` Other string `json:"other,omitempty"`
// +optional // +optional
@ -35,7 +35,7 @@ func (obj *Simple) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
type SimpleRoot struct { type SimpleRoot struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
api.ObjectMeta `json:"metadata"` apiv1.ObjectMeta `json:"metadata"`
// +optional // +optional
Other string `json:"other,omitempty"` Other string `json:"other,omitempty"`
// +optional // +optional

7
pkg/apiserver/watch_test.go
View File

@ -34,6 +34,7 @@ import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/rest"
apitesting "k8s.io/kubernetes/pkg/api/testing" apitesting "k8s.io/kubernetes/pkg/api/testing"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
apiservertesting "k8s.io/kubernetes/pkg/apiserver/testing" apiservertesting "k8s.io/kubernetes/pkg/apiserver/testing"
"k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/fields"
@ -69,9 +70,9 @@ var watchTestTable = []struct {
t watch.EventType t watch.EventType
obj runtime.Object obj runtime.Object
}{ }{
{watch.Added, &apiservertesting.Simple{ObjectMeta: api.ObjectMeta{Name: "foo"}}}, {watch.Added, &apiservertesting.Simple{ObjectMeta: apiv1.ObjectMeta{Name: "foo"}}},
{watch.Modified, &apiservertesting.Simple{ObjectMeta: api.ObjectMeta{Name: "bar"}}}, {watch.Modified, &apiservertesting.Simple{ObjectMeta: apiv1.ObjectMeta{Name: "bar"}}},
{watch.Deleted, &apiservertesting.Simple{ObjectMeta: api.ObjectMeta{Name: "bar"}}}, {watch.Deleted, &apiservertesting.Simple{ObjectMeta: apiv1.ObjectMeta{Name: "bar"}}},
} }
var podWatchTestTable = []struct { var podWatchTestTable = []struct {

8
pkg/kubectl/testing/types.generated.go
View File

@ -25,7 +25,7 @@ import (
"errors" "errors"
"fmt" "fmt"
codec1978 "github.com/ugorji/go/codec" codec1978 "github.com/ugorji/go/codec"
pkg2_api "k8s.io/kubernetes/pkg/api" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1"
pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1"
pkg3_types "k8s.io/kubernetes/pkg/types" pkg3_types "k8s.io/kubernetes/pkg/types"
"reflect" "reflect"
@ -63,7 +63,7 @@ func init() {
panic(err) panic(err)
} }
if false { // reference the types, but skip this branch at build/run time if false { // reference the types, but skip this branch at build/run time
var v0 pkg2_api.ObjectMeta var v0 pkg2_v1.ObjectMeta
var v1 pkg1_v1.TypeMeta var v1 pkg1_v1.TypeMeta
var v2 pkg3_types.UID var v2 pkg3_types.UID
var v3 time.Time var v3 time.Time
@ -346,7 +346,7 @@ func (x *TestStruct) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
case "metadata": case "metadata":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_api.ObjectMeta{} x.ObjectMeta = pkg2_v1.ObjectMeta{}
} else { } else {
yyv29 := &x.ObjectMeta yyv29 := &x.ObjectMeta
yyv29.CodecDecodeSelf(d) yyv29.CodecDecodeSelf(d)
@ -451,7 +451,7 @@ func (x *TestStruct) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_api.ObjectMeta{} x.ObjectMeta = pkg2_v1.ObjectMeta{}
} else { } else {
yyv40 := &x.ObjectMeta yyv40 := &x.ObjectMeta
yyv40.CodecDecodeSelf(d) yyv40.CodecDecodeSelf(d)

4
pkg/kubectl/testing/types.go
View File

@ -17,7 +17,7 @@ limitations under the License.
package testing package testing
import ( import (
"k8s.io/kubernetes/pkg/api" apiv1 "k8s.io/kubernetes/pkg/api/v1"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/runtime/schema"
) )
@ -25,7 +25,7 @@ import (
type TestStruct struct { type TestStruct struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
// +optional // +optional
api.ObjectMeta `json:"metadata,omitempty"` apiv1.ObjectMeta `json:"metadata,omitempty"`
Key string `json:"Key"` Key string `json:"Key"`
Map map[string]int `json:"Map"` Map map[string]int `json:"Map"`
StringList []string `json:"StringList"` StringList []string `json:"StringList"`

12
pkg/storage/etcd/api_object_versioner_test.go
View File

@ -19,19 +19,19 @@ package etcd
import ( import (
"testing" "testing"
"k8s.io/kubernetes/pkg/api" apiv1 "k8s.io/kubernetes/pkg/api/v1"
storagetesting "k8s.io/kubernetes/pkg/storage/testing" storagetesting "k8s.io/kubernetes/pkg/storage/testing"
) )
func TestObjectVersioner(t *testing.T) { func TestObjectVersioner(t *testing.T) {
v := APIObjectVersioner{} v := APIObjectVersioner{}
if ver, err := v.ObjectResourceVersion(&storagetesting.TestResource{ObjectMeta: api.ObjectMeta{ResourceVersion: "5"}}); err != nil || ver != 5 { if ver, err := v.ObjectResourceVersion(&storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{ResourceVersion: "5"}}); err != nil || ver != 5 {
t.Errorf("unexpected version: %d %v", ver, err) t.Errorf("unexpected version: %d %v", ver, err)
} }
if ver, err := v.ObjectResourceVersion(&storagetesting.TestResource{ObjectMeta: api.ObjectMeta{ResourceVersion: "a"}}); err == nil || ver != 0 { if ver, err := v.ObjectResourceVersion(&storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{ResourceVersion: "a"}}); err == nil || ver != 0 {
t.Errorf("unexpected version: %d %v", ver, err) t.Errorf("unexpected version: %d %v", ver, err)
} }
obj := &storagetesting.TestResource{ObjectMeta: api.ObjectMeta{ResourceVersion: "a"}} obj := &storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{ResourceVersion: "a"}}
if err := v.UpdateObject(obj, 5); err != nil { if err := v.UpdateObject(obj, 5); err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
@ -41,8 +41,8 @@ func TestObjectVersioner(t *testing.T) {
} }
func TestCompareResourceVersion(t *testing.T) { func TestCompareResourceVersion(t *testing.T) {
five := &storagetesting.TestResource{ObjectMeta: api.ObjectMeta{ResourceVersion: "5"}} five := &storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{ResourceVersion: "5"}}
six := &storagetesting.TestResource{ObjectMeta: api.ObjectMeta{ResourceVersion: "6"}} six := &storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{ResourceVersion: "6"}}
versioner := APIObjectVersioner{} versioner := APIObjectVersioner{}

13
pkg/storage/etcd/etcd_helper_test.go
View File

@ -28,6 +28,7 @@ import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/testapi"
apitesting "k8s.io/kubernetes/pkg/api/testing" apitesting "k8s.io/kubernetes/pkg/api/testing"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apimachinery/registered"
"k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/conversion"
"k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/fields"
@ -300,7 +301,7 @@ func TestGuaranteedUpdate(t *testing.T) {
key := "/some/key" key := "/some/key"
helper := newEtcdHelper(server.Client, codec, etcdtest.PathPrefix()) helper := newEtcdHelper(server.Client, codec, etcdtest.PathPrefix())
obj := &storagetesting.TestResource{ObjectMeta: api.ObjectMeta{Name: "foo"}, Value: 1} obj := &storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{Name: "foo"}, Value: 1}
err := helper.GuaranteedUpdate(context.TODO(), key, &storagetesting.TestResource{}, true, nil, storage.SimpleUpdate(func(in runtime.Object) (runtime.Object, error) { err := helper.GuaranteedUpdate(context.TODO(), key, &storagetesting.TestResource{}, true, nil, storage.SimpleUpdate(func(in runtime.Object) (runtime.Object, error) {
return obj, nil return obj, nil
})) }))
@ -310,7 +311,7 @@ func TestGuaranteedUpdate(t *testing.T) {
// Update an existing node. // Update an existing node.
callbackCalled := false callbackCalled := false
objUpdate := &storagetesting.TestResource{ObjectMeta: api.ObjectMeta{Name: "foo"}, Value: 2} objUpdate := &storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{Name: "foo"}, Value: 2}
err = helper.GuaranteedUpdate(context.TODO(), key, &storagetesting.TestResource{}, true, nil, storage.SimpleUpdate(func(in runtime.Object) (runtime.Object, error) { err = helper.GuaranteedUpdate(context.TODO(), key, &storagetesting.TestResource{}, true, nil, storage.SimpleUpdate(func(in runtime.Object) (runtime.Object, error) {
callbackCalled = true callbackCalled = true
@ -345,7 +346,7 @@ func TestGuaranteedUpdateNoChange(t *testing.T) {
key := "/some/key" key := "/some/key"
helper := newEtcdHelper(server.Client, codec, etcdtest.PathPrefix()) helper := newEtcdHelper(server.Client, codec, etcdtest.PathPrefix())
obj := &storagetesting.TestResource{ObjectMeta: api.ObjectMeta{Name: "foo"}, Value: 1} obj := &storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{Name: "foo"}, Value: 1}
err := helper.GuaranteedUpdate(context.TODO(), key, &storagetesting.TestResource{}, true, nil, storage.SimpleUpdate(func(in runtime.Object) (runtime.Object, error) { err := helper.GuaranteedUpdate(context.TODO(), key, &storagetesting.TestResource{}, true, nil, storage.SimpleUpdate(func(in runtime.Object) (runtime.Object, error) {
return obj, nil return obj, nil
})) }))
@ -355,7 +356,7 @@ func TestGuaranteedUpdateNoChange(t *testing.T) {
// Update an existing node with the same data // Update an existing node with the same data
callbackCalled := false callbackCalled := false
objUpdate := &storagetesting.TestResource{ObjectMeta: api.ObjectMeta{Name: "foo"}, Value: 1} objUpdate := &storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{Name: "foo"}, Value: 1}
err = helper.GuaranteedUpdate(context.TODO(), key, &storagetesting.TestResource{}, true, nil, storage.SimpleUpdate(func(in runtime.Object) (runtime.Object, error) { err = helper.GuaranteedUpdate(context.TODO(), key, &storagetesting.TestResource{}, true, nil, storage.SimpleUpdate(func(in runtime.Object) (runtime.Object, error) {
callbackCalled = true callbackCalled = true
return objUpdate, nil return objUpdate, nil
@ -376,7 +377,7 @@ func TestGuaranteedUpdateKeyNotFound(t *testing.T) {
helper := newEtcdHelper(server.Client, codec, etcdtest.PathPrefix()) helper := newEtcdHelper(server.Client, codec, etcdtest.PathPrefix())
// Create a new node. // Create a new node.
obj := &storagetesting.TestResource{ObjectMeta: api.ObjectMeta{Name: "foo"}, Value: 1} obj := &storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{Name: "foo"}, Value: 1}
f := storage.SimpleUpdate(func(in runtime.Object) (runtime.Object, error) { f := storage.SimpleUpdate(func(in runtime.Object) (runtime.Object, error) {
return obj, nil return obj, nil
@ -424,7 +425,7 @@ func TestGuaranteedUpdate_CreateCollision(t *testing.T) {
} }
currValue := in.(*storagetesting.TestResource).Value currValue := in.(*storagetesting.TestResource).Value
obj := &storagetesting.TestResource{ObjectMeta: api.ObjectMeta{Name: "foo"}, Value: currValue + 1} obj := &storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{Name: "foo"}, Value: currValue + 1}
return obj, nil return obj, nil
})) }))
if err != nil { if err != nil {

8
pkg/storage/testing/types.generated.go
View File

@ -25,7 +25,7 @@ import (
"errors" "errors"
"fmt" "fmt"
codec1978 "github.com/ugorji/go/codec" codec1978 "github.com/ugorji/go/codec"
pkg2_api "k8s.io/kubernetes/pkg/api" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1"
pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1"
pkg3_types "k8s.io/kubernetes/pkg/types" pkg3_types "k8s.io/kubernetes/pkg/types"
"reflect" "reflect"
@ -63,7 +63,7 @@ func init() {
panic(err) panic(err)
} }
if false { // reference the types, but skip this branch at build/run time if false { // reference the types, but skip this branch at build/run time
var v0 pkg2_api.ObjectMeta var v0 pkg2_v1.ObjectMeta
var v1 pkg1_v1.TypeMeta var v1 pkg1_v1.TypeMeta
var v2 pkg3_types.UID var v2 pkg3_types.UID
var v3 time.Time var v3 time.Time
@ -258,7 +258,7 @@ func (x *TestResource) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
} }
case "metadata": case "metadata":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_api.ObjectMeta{} x.ObjectMeta = pkg2_v1.ObjectMeta{}
} else { } else {
yyv20 := &x.ObjectMeta yyv20 := &x.ObjectMeta
yyv20.CodecDecodeSelf(d) yyv20.CodecDecodeSelf(d)
@ -327,7 +327,7 @@ func (x *TestResource) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_api.ObjectMeta{} x.ObjectMeta = pkg2_v1.ObjectMeta{}
} else { } else {
yyv25 := &x.ObjectMeta yyv25 := &x.ObjectMeta
yyv25.CodecDecodeSelf(d) yyv25.CodecDecodeSelf(d)

4
pkg/storage/testing/types.go
View File

@ -17,14 +17,14 @@ limitations under the License.
package testing package testing
import ( import (
"k8s.io/kubernetes/pkg/api" apiv1 "k8s.io/kubernetes/pkg/api/v1"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/runtime/schema"
) )
type TestResource struct { type TestResource struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
api.ObjectMeta `json:"metadata"` apiv1.ObjectMeta `json:"metadata"`
Value int `json:"value"` Value int `json:"value"`
} }