github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-27 05:04:52 +00:00
Code Issues Projects Releases Wiki Activity

fix duplicated imports of k8s code (#77484)

Browse Source 
* fix duplicated imports of api/core/v1

* fix duplicated imports of client-go/kubernetes

* fix duplicated imports of rest code

* change import name to more reasonable
This commit is contained in:
Daniel (Shijun) Qian
2019-05-09 01:12:48 +08:00
committed by Kubernetes Prow Robot
parent f7d92fb963
commit 5268f69405
35 changed files with 116 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/integration/apiserver/admissionwebhook/admission_test.go
View File

@@ -34,7 +34,6 @@ import (
admissionv1beta1 "k8s.io/api/admissionregistration/v1beta1"
appsv1beta1 "k8s.io/api/apps/v1beta1"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
policyv1beta1 "k8s.io/api/policy/v1beta1"
"k8s.io/apimachinery/pkg/api/errors"
@@ -46,7 +45,6 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait"
dynamic "k8s.io/client-go/dynamic"
"k8s.io/client-go/kubernetes"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/util/retry"
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
@@ -66,7 +64,7 @@ type testContext struct {
admissionHolder *holder
client dynamic.Interface
clientset kubernetes.Interface
clientset clientset.Interface
verb string
gvr schema.GroupVersionResource
resource metav1.APIResource
@@ -338,7 +336,7 @@ func TestWebhookV1beta1(t *testing.T) {
})
defer master.Cleanup()
if _, err := master.Client.CoreV1().Namespaces().Create(&v1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: testNamespace}}); err != nil {
if _, err := master.Client.CoreV1().Namespaces().Create(&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: testNamespace}}); err != nil {
t.Fatal(err)
}
if err := createV1beta1MutationWebhook(master.Client, webhookServer.URL+"/"+mutation); err != nil {