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

9
pkg/controller/garbagecollector/garbagecollector_test.go
View File

@@ -27,7 +27,6 @@ import (
_ "k8s.io/kubernetes/pkg/api/install"
"k8s.io/kubernetes/pkg/api/meta/metatypes"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apimachinery/registered"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
@@ -170,7 +169,7 @@ func TestProcessItem(t *testing.T) {
gc := setupGC(t, clientConfig)
item := &node{
identity: objectReference{
OwnerReference: metatypes.OwnerReference{
OwnerReference: metav1.OwnerReference{
Kind: pod.Kind,
APIVersion: pod.APIVersion,
Name: pod.Name,
@@ -326,8 +325,8 @@ func TestDependentsRace(t *testing.T) {
go func() {
for i := 0; i < updates; i++ {
dependent := &node{}
gc.propagator.addDependentToOwners(dependent, []metatypes.OwnerReference{{UID: ownerUID}})
gc.propagator.removeDependentFromOwners(dependent, []metatypes.OwnerReference{{UID: ownerUID}})
gc.propagator.addDependentToOwners(dependent, []metav1.OwnerReference{{UID: ownerUID}})
gc.propagator.removeDependentFromOwners(dependent, []metav1.OwnerReference{{UID: ownerUID}})
}
}()
go func() {
@@ -366,7 +365,7 @@ func TestGCListWatcher(t *testing.T) {
func podToGCNode(pod *v1.Pod) *node {
return &node{
identity: objectReference{
OwnerReference: metatypes.OwnerReference{
OwnerReference: metav1.OwnerReference{
Kind: pod.Kind,
APIVersion: pod.APIVersion,
Name: pod.Name,