diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.generated.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.generated.go index 4a41e0ff0fc..840b02d23d0 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.generated.go +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.generated.go @@ -25,7 +25,7 @@ import ( "errors" "fmt" 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" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" @@ -63,7 +63,7 @@ func init() { panic(err) } 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 v2 pkg3_types.UID var v3 time.Time @@ -264,7 +264,7 @@ func (x *TestType) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ObjectMeta = pkg2_api.ObjectMeta{} + x.ObjectMeta = pkg2_v1.ObjectMeta{} } else { yyv20 := &x.ObjectMeta yyv20.CodecDecodeSelf(d) @@ -334,7 +334,7 @@ func (x *TestType) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ObjectMeta = pkg2_api.ObjectMeta{} + x.ObjectMeta = pkg2_v1.ObjectMeta{} } else { yyv25 := &x.ObjectMeta yyv25.CodecDecodeSelf(d) diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.go index d948c6094ea..8d9c9411e57 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.go +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - "k8s.io/kubernetes/pkg/api" + apiv1 "k8s.io/kubernetes/pkg/api/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. // +k8s:openapi-gen=false // +optional - api.ObjectMeta `json:"metadata,omitempty"` + apiv1.ObjectMeta `json:"metadata,omitempty"` // +optional Status TestTypeStatus `json:"status,omitempty"` } diff --git a/pkg/apiserver/apiserver_test.go b/pkg/apiserver/apiserver_test.go index 4aaa5d9f32e..b658cf84ed8 100644 --- a/pkg/apiserver/apiserver_test.go +++ b/pkg/apiserver/apiserver_test.go @@ -39,6 +39,7 @@ import ( "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/v1" + apiv1 "k8s.io/kubernetes/pkg/api/v1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apiserver/filters" "k8s.io/kubernetes/pkg/apiserver/request" @@ -317,7 +318,7 @@ func handleInternal(storage map[string]rest.Storage, admissionControl admission. } 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) if err != nil { 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 err error 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 } @@ -1119,7 +1120,7 @@ func TestNonEmptyList(t *testing.T) { simpleStorage := SimpleRESTStorage{ list: []apiservertesting.Simple{ { - ObjectMeta: api.ObjectMeta{Name: "something", Namespace: "other"}, + ObjectMeta: apiv1.ObjectMeta{Name: "something", Namespace: "other"}, Other: "foo", }, }, @@ -1170,7 +1171,7 @@ func TestSelfLinkSkipsEmptyName(t *testing.T) { simpleStorage := SimpleRESTStorage{ list: []apiservertesting.Simple{ { - ObjectMeta: api.ObjectMeta{Namespace: "other"}, + ObjectMeta: apiv1.ObjectMeta{Namespace: "other"}, Other: "foo", }, }, @@ -1244,7 +1245,7 @@ func TestExport(t *testing.T) { storage := map[string]rest.Storage{} simpleStorage := SimpleRESTStorage{ item: apiservertesting.Simple{ - ObjectMeta: api.ObjectMeta{ + ObjectMeta: apiv1.ObjectMeta{ ResourceVersion: "1234", CreationTimestamp: metav1.NewTime(time.Unix(10, 10)), }, @@ -2177,7 +2178,7 @@ func TestPatch(t *testing.T) { storage := map[string]rest.Storage{} ID := "id" item := &apiservertesting.Simple{ - ObjectMeta: api.ObjectMeta{ + ObjectMeta: apiv1.ObjectMeta{ Name: ID, Namespace: "", // update should allow the client to send an empty namespace UID: "uid", @@ -2216,7 +2217,7 @@ func TestPatchRequiresMatchingName(t *testing.T) { storage := map[string]rest.Storage{} ID := "id" item := &apiservertesting.Simple{ - ObjectMeta: api.ObjectMeta{ + ObjectMeta: apiv1.ObjectMeta{ Name: ID, Namespace: "", // update should allow the client to send an empty namespace UID: "uid", @@ -2257,7 +2258,7 @@ func TestUpdate(t *testing.T) { defer server.Close() item := &apiservertesting.Simple{ - ObjectMeta: api.ObjectMeta{ + ObjectMeta: apiv1.ObjectMeta{ Name: ID, Namespace: "", // update should allow the client to send an empty namespace }, @@ -2294,7 +2295,7 @@ func TestUpdateInvokesAdmissionControl(t *testing.T) { defer server.Close() item := &apiservertesting.Simple{ - ObjectMeta: api.ObjectMeta{ + ObjectMeta: apiv1.ObjectMeta{ Name: ID, Namespace: api.NamespaceDefault, }, @@ -2356,7 +2357,7 @@ func TestUpdateAllowsMissingNamespace(t *testing.T) { defer server.Close() item := &apiservertesting.Simple{ - ObjectMeta: api.ObjectMeta{ + ObjectMeta: apiv1.ObjectMeta{ Name: ID, }, Other: "bar", @@ -2393,7 +2394,7 @@ func TestUpdateAllowsMismatchedNamespaceOnError(t *testing.T) { defer server.Close() item := &apiservertesting.Simple{ - ObjectMeta: api.ObjectMeta{ + ObjectMeta: apiv1.ObjectMeta{ Name: ID, Namespace: "other", // does not match request }, @@ -2430,7 +2431,7 @@ func TestUpdatePreventsMismatchedNamespace(t *testing.T) { defer server.Close() item := &apiservertesting.Simple{ - ObjectMeta: api.ObjectMeta{ + ObjectMeta: apiv1.ObjectMeta{ Name: ID, Namespace: "other", }, @@ -2465,7 +2466,7 @@ func TestUpdateMissing(t *testing.T) { defer server.Close() item := &apiservertesting.Simple{ - ObjectMeta: api.ObjectMeta{ + ObjectMeta: apiv1.ObjectMeta{ Name: ID, Namespace: api.NamespaceDefault, }, @@ -3226,7 +3227,7 @@ func TestUpdateChecksAPIVersion(t *testing.T) { defer server.Close() 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) if err != nil { t.Fatalf("unexpected error: %v", err) diff --git a/pkg/apiserver/testing/types.generated.go b/pkg/apiserver/testing/types.generated.go index d0df5318756..e6a3c6b4a34 100644 --- a/pkg/apiserver/testing/types.generated.go +++ b/pkg/apiserver/testing/types.generated.go @@ -25,7 +25,7 @@ import ( "errors" "fmt" 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" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" @@ -63,7 +63,7 @@ func init() { panic(err) } 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 v2 pkg3_types.UID var v3 time.Time @@ -299,7 +299,7 @@ func (x *Simple) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ObjectMeta = pkg2_api.ObjectMeta{} + x.ObjectMeta = pkg2_v1.ObjectMeta{} } else { yyv23 := &x.ObjectMeta yyv23.CodecDecodeSelf(d) @@ -380,7 +380,7 @@ func (x *Simple) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ObjectMeta = pkg2_api.ObjectMeta{} + x.ObjectMeta = pkg2_v1.ObjectMeta{} } else { yyv30 := &x.ObjectMeta yyv30.CodecDecodeSelf(d) @@ -667,7 +667,7 @@ func (x *SimpleRoot) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ObjectMeta = pkg2_api.ObjectMeta{} + x.ObjectMeta = pkg2_v1.ObjectMeta{} } else { yyv56 := &x.ObjectMeta yyv56.CodecDecodeSelf(d) @@ -748,7 +748,7 @@ func (x *SimpleRoot) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ObjectMeta = pkg2_api.ObjectMeta{} + x.ObjectMeta = pkg2_v1.ObjectMeta{} } else { yyv63 := &x.ObjectMeta yyv63.CodecDecodeSelf(d) diff --git a/pkg/apiserver/testing/types.go b/pkg/apiserver/testing/types.go index ef6efa3a4e0..1d089416397 100644 --- a/pkg/apiserver/testing/types.go +++ b/pkg/apiserver/testing/types.go @@ -17,14 +17,14 @@ limitations under the License. package testing import ( - "k8s.io/kubernetes/pkg/api" + apiv1 "k8s.io/kubernetes/pkg/api/v1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime/schema" ) type Simple struct { - metav1.TypeMeta `json:",inline"` - api.ObjectMeta `json:"metadata"` + metav1.TypeMeta `json:",inline"` + apiv1.ObjectMeta `json:"metadata"` // +optional Other string `json:"other,omitempty"` // +optional @@ -34,8 +34,8 @@ type Simple struct { func (obj *Simple) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta } type SimpleRoot struct { - metav1.TypeMeta `json:",inline"` - api.ObjectMeta `json:"metadata"` + metav1.TypeMeta `json:",inline"` + apiv1.ObjectMeta `json:"metadata"` // +optional Other string `json:"other,omitempty"` // +optional diff --git a/pkg/apiserver/watch_test.go b/pkg/apiserver/watch_test.go index b924cfd0da2..6b95b8c0d42 100644 --- a/pkg/apiserver/watch_test.go +++ b/pkg/apiserver/watch_test.go @@ -34,6 +34,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" apitesting "k8s.io/kubernetes/pkg/api/testing" + apiv1 "k8s.io/kubernetes/pkg/api/v1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" apiservertesting "k8s.io/kubernetes/pkg/apiserver/testing" "k8s.io/kubernetes/pkg/fields" @@ -69,9 +70,9 @@ var watchTestTable = []struct { t watch.EventType obj runtime.Object }{ - {watch.Added, &apiservertesting.Simple{ObjectMeta: api.ObjectMeta{Name: "foo"}}}, - {watch.Modified, &apiservertesting.Simple{ObjectMeta: api.ObjectMeta{Name: "bar"}}}, - {watch.Deleted, &apiservertesting.Simple{ObjectMeta: api.ObjectMeta{Name: "bar"}}}, + {watch.Added, &apiservertesting.Simple{ObjectMeta: apiv1.ObjectMeta{Name: "foo"}}}, + {watch.Modified, &apiservertesting.Simple{ObjectMeta: apiv1.ObjectMeta{Name: "bar"}}}, + {watch.Deleted, &apiservertesting.Simple{ObjectMeta: apiv1.ObjectMeta{Name: "bar"}}}, } var podWatchTestTable = []struct { diff --git a/pkg/kubectl/testing/types.generated.go b/pkg/kubectl/testing/types.generated.go index d9944eabf12..d2780b5f67c 100644 --- a/pkg/kubectl/testing/types.generated.go +++ b/pkg/kubectl/testing/types.generated.go @@ -25,7 +25,7 @@ import ( "errors" "fmt" 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" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" @@ -63,7 +63,7 @@ func init() { panic(err) } 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 v2 pkg3_types.UID var v3 time.Time @@ -346,7 +346,7 @@ func (x *TestStruct) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ObjectMeta = pkg2_api.ObjectMeta{} + x.ObjectMeta = pkg2_v1.ObjectMeta{} } else { yyv29 := &x.ObjectMeta yyv29.CodecDecodeSelf(d) @@ -451,7 +451,7 @@ func (x *TestStruct) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ObjectMeta = pkg2_api.ObjectMeta{} + x.ObjectMeta = pkg2_v1.ObjectMeta{} } else { yyv40 := &x.ObjectMeta yyv40.CodecDecodeSelf(d) diff --git a/pkg/kubectl/testing/types.go b/pkg/kubectl/testing/types.go index 20be8f0967d..0260cdde130 100644 --- a/pkg/kubectl/testing/types.go +++ b/pkg/kubectl/testing/types.go @@ -17,7 +17,7 @@ limitations under the License. package testing import ( - "k8s.io/kubernetes/pkg/api" + apiv1 "k8s.io/kubernetes/pkg/api/v1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime/schema" ) @@ -25,11 +25,11 @@ import ( type TestStruct struct { metav1.TypeMeta `json:",inline"` // +optional - api.ObjectMeta `json:"metadata,omitempty"` - Key string `json:"Key"` - Map map[string]int `json:"Map"` - StringList []string `json:"StringList"` - IntList []int `json:"IntList"` + apiv1.ObjectMeta `json:"metadata,omitempty"` + Key string `json:"Key"` + Map map[string]int `json:"Map"` + StringList []string `json:"StringList"` + IntList []int `json:"IntList"` } func (obj *TestStruct) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta } diff --git a/pkg/storage/etcd/api_object_versioner_test.go b/pkg/storage/etcd/api_object_versioner_test.go index 18a20901253..ad64e92887c 100644 --- a/pkg/storage/etcd/api_object_versioner_test.go +++ b/pkg/storage/etcd/api_object_versioner_test.go @@ -19,19 +19,19 @@ package etcd import ( "testing" - "k8s.io/kubernetes/pkg/api" + apiv1 "k8s.io/kubernetes/pkg/api/v1" storagetesting "k8s.io/kubernetes/pkg/storage/testing" ) func TestObjectVersioner(t *testing.T) { 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) } - 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) } - obj := &storagetesting.TestResource{ObjectMeta: api.ObjectMeta{ResourceVersion: "a"}} + obj := &storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{ResourceVersion: "a"}} if err := v.UpdateObject(obj, 5); err != nil { t.Fatalf("unexpected error: %v", err) } @@ -41,8 +41,8 @@ func TestObjectVersioner(t *testing.T) { } func TestCompareResourceVersion(t *testing.T) { - five := &storagetesting.TestResource{ObjectMeta: api.ObjectMeta{ResourceVersion: "5"}} - six := &storagetesting.TestResource{ObjectMeta: api.ObjectMeta{ResourceVersion: "6"}} + five := &storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{ResourceVersion: "5"}} + six := &storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{ResourceVersion: "6"}} versioner := APIObjectVersioner{} diff --git a/pkg/storage/etcd/etcd_helper_test.go b/pkg/storage/etcd/etcd_helper_test.go index dd72b1f2083..66353274898 100644 --- a/pkg/storage/etcd/etcd_helper_test.go +++ b/pkg/storage/etcd/etcd_helper_test.go @@ -28,6 +28,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" + apiv1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/fields" @@ -300,7 +301,7 @@ func TestGuaranteedUpdate(t *testing.T) { key := "/some/key" 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) { return obj, nil })) @@ -310,7 +311,7 @@ func TestGuaranteedUpdate(t *testing.T) { // Update an existing node. 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) { callbackCalled = true @@ -345,7 +346,7 @@ func TestGuaranteedUpdateNoChange(t *testing.T) { key := "/some/key" 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) { return obj, nil })) @@ -355,7 +356,7 @@ func TestGuaranteedUpdateNoChange(t *testing.T) { // Update an existing node with the same data 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) { callbackCalled = true return objUpdate, nil @@ -376,7 +377,7 @@ func TestGuaranteedUpdateKeyNotFound(t *testing.T) { helper := newEtcdHelper(server.Client, codec, etcdtest.PathPrefix()) // 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) { return obj, nil @@ -424,7 +425,7 @@ func TestGuaranteedUpdate_CreateCollision(t *testing.T) { } 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 })) if err != nil { diff --git a/pkg/storage/testing/types.generated.go b/pkg/storage/testing/types.generated.go index e37fe8e1d89..e84390460aa 100644 --- a/pkg/storage/testing/types.generated.go +++ b/pkg/storage/testing/types.generated.go @@ -25,7 +25,7 @@ import ( "errors" "fmt" 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" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" @@ -63,7 +63,7 @@ func init() { panic(err) } 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 v2 pkg3_types.UID var v3 time.Time @@ -258,7 +258,7 @@ func (x *TestResource) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ObjectMeta = pkg2_api.ObjectMeta{} + x.ObjectMeta = pkg2_v1.ObjectMeta{} } else { yyv20 := &x.ObjectMeta yyv20.CodecDecodeSelf(d) @@ -327,7 +327,7 @@ func (x *TestResource) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ObjectMeta = pkg2_api.ObjectMeta{} + x.ObjectMeta = pkg2_v1.ObjectMeta{} } else { yyv25 := &x.ObjectMeta yyv25.CodecDecodeSelf(d) diff --git a/pkg/storage/testing/types.go b/pkg/storage/testing/types.go index e1276795c65..690b1ab3b69 100644 --- a/pkg/storage/testing/types.go +++ b/pkg/storage/testing/types.go @@ -17,15 +17,15 @@ limitations under the License. package testing import ( - "k8s.io/kubernetes/pkg/api" + apiv1 "k8s.io/kubernetes/pkg/api/v1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime/schema" ) type TestResource struct { - metav1.TypeMeta `json:",inline"` - api.ObjectMeta `json:"metadata"` - Value int `json:"value"` + metav1.TypeMeta `json:",inline"` + apiv1.ObjectMeta `json:"metadata"` + Value int `json:"value"` } func (obj *TestResource) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }