github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues 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/volume/testing/testing.go
View File

@@ -27,11 +27,11 @@ import (
"testing"
"time"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/uuid"
utiltesting "k8s.io/client-go/util/testing"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/cloudprovider"