Change references to OwnerReference

federation/apis/core/v1/conversion.go

@@ -38,8 +38,6 @@ func addConversionFuncs(scheme *runtime.Scheme) error {
 		v1.Convert_api_ObjectMeta_To_v1_ObjectMeta,
 		v1.Convert_v1_ObjectReference_To_api_ObjectReference,
 		v1.Convert_api_ObjectReference_To_v1_ObjectReference,
-		v1.Convert_v1_OwnerReference_To_api_OwnerReference,
-		v1.Convert_api_OwnerReference_To_v1_OwnerReference,
 		v1.Convert_v1_Secret_To_api_Secret,
 		v1.Convert_api_Secret_To_v1_Secret,
 		v1.Convert_v1_SecretList_To_api_SecretList,

pkg/api/helpers_test.go

@@ -22,6 +22,7 @@ import (
 	"testing"
 
 	"k8s.io/kubernetes/pkg/api/resource"
+	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/labels"
 )
 
@@ -438,7 +439,7 @@ func TestGetAvoidPodsFromNode(t *testing.T) {
 				PreferAvoidPods: []PreferAvoidPodsEntry{
 					{
 						PodSignature: PodSignature{
-							PodController: &OwnerReference{
+							PodController: &metav1.OwnerReference{
 								APIVersion: "v1",
 								Kind:       "ReplicationController",
 								Name:       "foo",

pkg/api/v1/helpers_test.go

@@ -21,6 +21,7 @@ import (
 	"testing"
 
 	"k8s.io/kubernetes/pkg/api"
+	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/labels"
 )
 
@@ -376,7 +377,7 @@ func TestGetAvoidPodsFromNode(t *testing.T) {
 				PreferAvoidPods: []PreferAvoidPodsEntry{
 					{
 						PodSignature: PodSignature{
-							PodController: &OwnerReference{
+							PodController: &metav1.OwnerReference{
 								APIVersion: "v1",
 								Kind:       "ReplicationController",
 								Name:       "foo",

pkg/api/validation/validation.go

@@ -33,6 +33,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/resource"
 	apiservice "k8s.io/kubernetes/pkg/api/service"
 	"k8s.io/kubernetes/pkg/api/v1"
+	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation"
 	storageutil "k8s.io/kubernetes/pkg/apis/storage/util"
 	"k8s.io/kubernetes/pkg/capabilities"

pkg/controller/controller_ref_manager.go

@@ -23,6 +23,7 @@ import (
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/api/v1"
+	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/runtime/schema"
 )

pkg/controller/replication/replication_controller.go

@@ -27,6 +27,7 @@ import (
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/api/v1"
+	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
 	v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1"

plugin/pkg/admission/gc/gc_admission_test.go

@@ -21,6 +21,7 @@ import (
 
 	"k8s.io/kubernetes/pkg/admission"
 	"k8s.io/kubernetes/pkg/api"
+	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/auth/authorizer"
 	"k8s.io/kubernetes/pkg/auth/user"
 	"k8s.io/kubernetes/pkg/runtime"

plugin/pkg/scheduler/algorithm/priorities/node_prefer_avoid_pods_test.go

@@ -22,6 +22,7 @@ import (
 	"testing"
 
 	"k8s.io/kubernetes/pkg/api/v1"
+	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api"
 	"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
 )

plugin/pkg/scheduler/algorithm/priorities/util/util.go

@@ -16,7 +16,10 @@ limitations under the License.
 
 package util
 
-import "k8s.io/kubernetes/pkg/api/v1"
+import (
+	"k8s.io/kubernetes/pkg/api/v1"
+	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
+)
 
 func GetControllerRef(pod *v1.Pod) *v1.OwnerReference {
 	if len(pod.OwnerReferences) == 0 {

plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go

@@ -22,6 +22,7 @@ import (
 	"strconv"
 
 	"k8s.io/kubernetes/pkg/api/v1"
+	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/cloudprovider/providers/aws"
 	"k8s.io/kubernetes/pkg/util/sets"
 	"k8s.io/kubernetes/plugin/pkg/scheduler"