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

pkg/api/resource: move to apimachinery

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2017-01-25 14:13:07 +01:00
committed by Dr. Stefan Schimanski
parent 6b6b6c747e
commit bc6fdd925d
212 changed files with 220 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/node/testutil/test_utils.go
View File

@@ -23,6 +23,7 @@ import (
"time"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
@@ -30,7 +31,6 @@ import (
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/util/clock"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
v1core "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1"