github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-06-28 07:57:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #55659 from CaoShuFeng/duplicated_import

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 53780, 55663, 55321, 52421, 55659). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

remove duplicated import

**Release note**:
```release-note
NONE
```

Kubernetes-commit: c339a54b53bd05eb642618bffda727196e38bc70
This commit is contained in:
Kubernetes Publisher 2017-11-15 09:30:40 -08:00
commit 8d6b7712c9
3 changed files with 704 additions and 706 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
Godeps/Godeps.json generated
View File

@ -480,219 +480,219 @@
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/equality", "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/errors", "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/meta", "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/resource", "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/testing", "ImportPath": "k8s.io/apimachinery/pkg/api/testing",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip", "ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery", "ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced", "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered", "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion", "ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured", "ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/fields", "ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/labels", "ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime", "ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/selection", "ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/types", "ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/cache", "ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/clock", "ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/diff", "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/errors", "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/framer", "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream", "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy", "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr", "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/json", "ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch", "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/net", "ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand", "ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime", "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/sets", "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch", "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation", "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/wait", "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml", "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/version", "ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/watch", "ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "a0fe0f715cac3e0e3c319d66e21507828a235dc6" "Rev": "06a5842e5143186ea755df4856ab23485473c206"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/common", "ImportPath": "k8s.io/kube-openapi/pkg/common",

5
discovery/helper_blackbox_test.go
View File

@ -28,7 +28,6 @@ import (
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
uapi "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
@ -87,7 +86,7 @@ func TestServerSupportsVersion(t *testing.T) {
NegotiatedSerializer: scheme.Codecs, NegotiatedSerializer: scheme.Codecs,
Resp: &http.Response{ Resp: &http.Response{
StatusCode: test.statusCode, StatusCode: test.statusCode,
Body: objBody(&uapi.APIVersions{Versions: test.serverVersions}), Body: objBody(&metav1.APIVersions{Versions: test.serverVersions}),
}, },
Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) { Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
if test.sendErr != nil { if test.sendErr != nil {
@ -95,7 +94,7 @@ func TestServerSupportsVersion(t *testing.T) {
} }
header := http.Header{} header := http.Header{}
header.Set("Content-Type", runtime.ContentTypeJSON) header.Set("Content-Type", runtime.ContentTypeJSON)
return &http.Response{StatusCode: test.statusCode, Header: header, Body: objBody(&uapi.APIVersions{Versions: test.serverVersions})}, nil return &http.Response{StatusCode: test.statusCode, Header: header, Body: objBody(&metav1.APIVersions{Versions: test.serverVersions})}, nil
}), }),
} }
c := discovery.NewDiscoveryClientForConfigOrDie(&restclient.Config{}) c := discovery.NewDiscoveryClientForConfigOrDie(&restclient.Config{})

5
util/certificate/csr/csr_test.go
View File

@ -22,7 +22,6 @@ import (
certificates "k8s.io/api/certificates/v1beta1" certificates "k8s.io/api/certificates/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
certificatesclient "k8s.io/client-go/kubernetes/typed/certificates/v1beta1" certificatesclient "k8s.io/client-go/kubernetes/typed/certificates/v1beta1"
certutil "k8s.io/client-go/util/cert" certutil "k8s.io/client-go/util/cert"
@ -98,11 +97,11 @@ func (c *fakeClient) Create(*certificates.CertificateSigningRequest) (*certifica
return &csr, nil return &csr, nil
} }
func (c *fakeClient) List(opts v1.ListOptions) (*certificates.CertificateSigningRequestList, error) { func (c *fakeClient) List(opts metav1.ListOptions) (*certificates.CertificateSigningRequestList, error) {
return &certificates.CertificateSigningRequestList{}, nil return &certificates.CertificateSigningRequestList{}, nil
} }
func (c *fakeClient) Watch(opts v1.ListOptions) (watch.Interface, error) { func (c *fakeClient) Watch(opts metav1.ListOptions) (watch.Interface, error) {
c.watch = watch.NewFakeWithChanSize(1, false) c.watch = watch.NewFakeWithChanSize(1, false)
c.watch.Add(c.generateCSR()) c.watch.Add(c.generateCSR())
c.watch.Stop() c.watch.Stop()