github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-13 21:25:09 +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

13
test/integration/auth/node_test.go
View File

@@ -38,7 +38,6 @@ import (
utilfeature "k8s.io/apiserver/pkg/util/feature"
utilfeaturetesting "k8s.io/apiserver/pkg/util/feature/testing"
clientset "k8s.io/client-go/kubernetes"
externalclientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/scheme"
kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing"
"k8s.io/kubernetes/pkg/features"
@@ -187,7 +186,7 @@ func TestNodeAuthorizer(t *testing.T) {
return err
}
}
getVolumeAttachment := func(client externalclientset.Interface) func() error {
getVolumeAttachment := func(client clientset.Interface) func() error {
return func() error {
_, err := client.StorageV1().VolumeAttachments().Get("myattachment", metav1.GetOptions{})
return err
@@ -398,13 +397,13 @@ func TestNodeAuthorizer(t *testing.T) {
}
}
getNode1CSINode := func(client externalclientset.Interface) func() error {
getNode1CSINode := func(client clientset.Interface) func() error {
return func() error {
_, err := client.StorageV1beta1().CSINodes().Get("node1", metav1.GetOptions{})
return err
}
}
createNode1CSINode := func(client externalclientset.Interface) func() error {
createNode1CSINode := func(client clientset.Interface) func() error {
return func() error {
nodeInfo := &storagev1beta1.CSINode{
ObjectMeta: metav1.ObjectMeta{
@@ -424,7 +423,7 @@ func TestNodeAuthorizer(t *testing.T) {
return err
}
}
updateNode1CSINode := func(client externalclientset.Interface) func() error {
updateNode1CSINode := func(client clientset.Interface) func() error {
return func() error {
nodeInfo, err := client.StorageV1beta1().CSINodes().Get("node1", metav1.GetOptions{})
if err != nil {
@@ -441,7 +440,7 @@ func TestNodeAuthorizer(t *testing.T) {
return err
}
}
patchNode1CSINode := func(client externalclientset.Interface) func() error {
patchNode1CSINode := func(client clientset.Interface) func() error {
return func() error {
bs := []byte(fmt.Sprintf(`{"csiDrivers": [ { "driver": "net.example.storage.driver2", "nodeID": "net.example.storage/node1", "topologyKeys": [ "net.example.storage/region" ] } ] }`))
// StrategicMergePatch is unsupported by CRs. Falling back to MergePatch
@@ -449,7 +448,7 @@ func TestNodeAuthorizer(t *testing.T) {
return err
}
}
deleteNode1CSINode := func(client externalclientset.Interface) func() error {
deleteNode1CSINode := func(client clientset.Interface) func() error {
return func() error {
return client.StorageV1beta1().CSINodes().Delete("node1", &metav1.DeleteOptions{})
}

5
test/integration/auth/rbac_test.go
View File

@@ -44,7 +44,6 @@ import (
utilfeature "k8s.io/apiserver/pkg/util/feature"
utilfeaturetesting "k8s.io/apiserver/pkg/util/feature/testing"
clientset "k8s.io/client-go/kubernetes"
externalclientset "k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest"
watchtools "k8s.io/client-go/tools/watch"
"k8s.io/client-go/transport"
@@ -74,10 +73,10 @@ func clientForToken(user string) *http.Client {
}
}
func clientsetForToken(user string, config *restclient.Config) (clientset.Interface, externalclientset.Interface) {
func clientsetForToken(user string, config *restclient.Config) (clientset.Interface, clientset.Interface) {
configCopy := *config
configCopy.BearerToken = user
return clientset.NewForConfigOrDie(&configCopy), externalclientset.NewForConfigOrDie(&configCopy)
return clientset.NewForConfigOrDie(&configCopy), clientset.NewForConfigOrDie(&configCopy)
}
func crdClientsetForToken(user string, config *restclient.Config) apiextensionsclient.Interface {