github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move OwnerReference to pkg/apis/meta/v1 and remove metatypes pkg

Browse Source 
OwnerReference is common.
This commit is contained in:
Clayton Coleman
2016-12-03 22:42:29 -05:00
parent 8eb3e9a518
commit c30862a488
12 changed files with 59 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/apis/meta/v1/unstructured/unstructured_test.go
View File

@@ -24,7 +24,6 @@ import (
"time"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/meta/metatypes"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/api/validation"
"k8s.io/kubernetes/pkg/apimachinery/registered"
@@ -215,7 +214,7 @@ func TestUnstructuredGetters(t *testing.T) {
t.Errorf("GetAnnotations() = %s, want %s", got, want)
}
refs := unstruct.GetOwnerReferences()
expectedOwnerReferences := []metatypes.OwnerReference{
expectedOwnerReferences := []metav1.OwnerReference{
{
Kind: "Pod",
Name: "poda",
@@ -301,7 +300,7 @@ func TestUnstructuredSetters(t *testing.T) {
unstruct.SetDeletionTimestamp(&date)
unstruct.SetLabels(map[string]string{"test_label": "test_value"})
unstruct.SetAnnotations(map[string]string{"test_annotation": "test_value"})
newOwnerReferences := []metatypes.OwnerReference{
newOwnerReferences := []metav1.OwnerReference{
{
Kind: "Pod",
Name: "poda",