Move List (the type) into metav1 but preserve the exposed type

Kubernetes-commit: 1b3836d5df302281a9db4b03bdc8fd5079142431
This commit is contained in:
Clayton Coleman 2017-08-05 22:51:55 -04:00 committed by Kubernetes Publisher
parent b1046943dc
commit 32ad290dcb
2 changed files with 4 additions and 2 deletions

View File

@ -11,6 +11,7 @@ go_library(
deps = [ deps = [
"//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
], ],
) )

View File

@ -24,6 +24,7 @@ import (
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
) )
@ -61,10 +62,10 @@ func GetReference(scheme *runtime.Scheme, obj runtime.Object) (*v1.ObjectReferen
} }
// An object that implements only List has enough metadata to build a reference // An object that implements only List has enough metadata to build a reference
var listMeta meta.List var listMeta metav1.Common
objectMeta, err := meta.Accessor(obj) objectMeta, err := meta.Accessor(obj)
if err != nil { if err != nil {
listMeta, err = meta.ListAccessor(obj) listMeta, err = meta.CommonAccessor(obj)
if err != nil { if err != nil {
return nil, err return nil, err
} }