Fix references from serializable types to use v1.ObjectMeta

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)

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 }