From f9874ff36b38658ae4843a5dafecdfb05878ba64 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Thu, 19 Mar 2020 10:27:54 -0700 Subject: [PATCH] Merge pull request #89159 from dims/move-term-package-to-component-base Move term package to component base and switch to moby/term Kubernetes-commit: bd07a408c1f82858fd63164f3b2937fd5f6905ce --- Godeps/Godeps.json | 30 +++++++++++++++++------------- go.mod | 27 +++++++++++++-------------- go.sum | 7 +++++++ 3 files changed, 37 insertions(+), 27 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index fbb19d28..1b84f9e4 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -118,10 +118,6 @@ "ImportPath": "github.com/docker/distribution", "Rev": "v2.7.1" }, - { - "ImportPath": "github.com/docker/docker", - "Rev": "be7ac8be2ae0" - }, { "ImportPath": "github.com/docker/spdystream", "Rev": "449fdfce4d96" @@ -224,7 +220,7 @@ }, { "ImportPath": "github.com/google/go-cmp", - "Rev": "v0.3.0" + "Rev": "v0.3.1" }, { "ImportPath": "github.com/google/gofuzz", @@ -350,6 +346,10 @@ "ImportPath": "github.com/mitchellh/mapstructure", "Rev": "v1.1.2" }, + { + "ImportPath": "github.com/moby/term", + "Rev": "672ec06f55cd" + }, { "ImportPath": "github.com/modern-go/concurrent", "Rev": "bacd9c7ef1dd" @@ -392,7 +392,7 @@ }, { "ImportPath": "github.com/pkg/errors", - "Rev": "v0.8.1" + "Rev": "v0.9.1" }, { "ImportPath": "github.com/pmezard/go-difflib", @@ -558,33 +558,37 @@ "ImportPath": "gotest.tools", "Rev": "v2.2.0" }, + { + "ImportPath": "gotest.tools/v3", + "Rev": "v3.0.2" + }, { "ImportPath": "honnef.co/go/tools", "Rev": "3f1c8253044a" }, { "ImportPath": "k8s.io/api", - "Rev": "c322e7106b58" + "Rev": "eb909d5fe0e7" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "1a505bc60c6d" + "Rev": "147abd67b880" }, { "ImportPath": "k8s.io/cli-runtime", - "Rev": "5fd0fb8a5147" + "Rev": "2818f417d17e" }, { "ImportPath": "k8s.io/client-go", - "Rev": "c426e0f36d6b" + "Rev": "365234d2fcf0" }, { "ImportPath": "k8s.io/code-generator", - "Rev": "6a048a382944" + "Rev": "6bb2b634cece" }, { "ImportPath": "k8s.io/component-base", - "Rev": "6639e587ba98" + "Rev": "dfc3f1250855" }, { "ImportPath": "k8s.io/gengo", @@ -600,7 +604,7 @@ }, { "ImportPath": "k8s.io/metrics", - "Rev": "f83af58644c3" + "Rev": "582cd349a422" }, { "ImportPath": "k8s.io/utils", diff --git a/go.mod b/go.mod index 8c0e966b..11fa05f0 100644 --- a/go.mod +++ b/go.mod @@ -34,14 +34,14 @@ require ( github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 gopkg.in/yaml.v2 v2.2.8 - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/cli-runtime v0.0.0 - k8s.io/client-go v0.0.0 - k8s.io/component-base v0.0.0 + k8s.io/api v0.0.0-20200319202348-eb909d5fe0e7 + k8s.io/apimachinery v0.0.0-20200319202151-147abd67b880 + k8s.io/cli-runtime v0.0.0-20200319204635-2818f417d17e + k8s.io/client-go v0.0.0-20200319202630-365234d2fcf0 + k8s.io/component-base v0.0.0-20200319203152-dfc3f1250855 k8s.io/klog v1.0.0 k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c - k8s.io/metrics v0.0.0 + k8s.io/metrics v0.0.0-20200319204508-582cd349a422 k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab sigs.k8s.io/kustomize v2.0.3+incompatible sigs.k8s.io/yaml v1.2.0 @@ -51,12 +51,11 @@ require ( replace ( golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13 - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/cli-runtime => ../cli-runtime - k8s.io/client-go => ../client-go - k8s.io/code-generator => ../code-generator - k8s.io/component-base => ../component-base - k8s.io/kubectl => ../kubectl - k8s.io/metrics => ../metrics + k8s.io/api => k8s.io/api v0.0.0-20200319202348-eb909d5fe0e7 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200319202151-147abd67b880 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200319204635-2818f417d17e + k8s.io/client-go => k8s.io/client-go v0.0.0-20200319202630-365234d2fcf0 + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200319201949-6bb2b634cece + k8s.io/component-base => k8s.io/component-base v0.0.0-20200319203152-dfc3f1250855 + k8s.io/metrics => k8s.io/metrics v0.0.0-20200319204508-582cd349a422 ) diff --git a/go.sum b/go.sum index 7efb2869..fa23981e 100644 --- a/go.sum +++ b/go.sum @@ -314,6 +314,12 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +k8s.io/api v0.0.0-20200319202348-eb909d5fe0e7/go.mod h1:5nMyHS4bWX496fulniJ+Sws3P6GLvaP43GadMObLf58= +k8s.io/apimachinery v0.0.0-20200319202151-147abd67b880/go.mod h1:yKN3QjQfKl8UdUL9RQ+/1VkR7nIUs7w02zC5CXhD+G0= +k8s.io/cli-runtime v0.0.0-20200319204635-2818f417d17e/go.mod h1:Nvk21zi6gAb9nJ+K+zEbYeOgylq4N7oDTA8QEEft5I4= +k8s.io/client-go v0.0.0-20200319202630-365234d2fcf0/go.mod h1:peZZtJ3/dSGdPT/rn6th1avRB2RsAVCjb6uBmwIndho= +k8s.io/code-generator v0.0.0-20200319201949-6bb2b634cece/go.mod h1:HgVCDA66DadRZIO1Ym1MX49lfUdXKOzJ8HA7GQVQTMI= +k8s.io/component-base v0.0.0-20200319203152-dfc3f1250855/go.mod h1:vVQbtKtC55jRBis6wh7/e228otzRkcVSGyBbmNDqRy0= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= @@ -322,6 +328,7 @@ k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c h1:/KUFqjjqAcY4Us6luF5RDNZ16KJtb49HfR3ZHB9qYXM= k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= +k8s.io/metrics v0.0.0-20200319204508-582cd349a422/go.mod h1:+hUPGhHrRQHzL/aliylusb0xW9EnCicE1DVDpsyHYAw= k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab h1:I3f2hcBrepGRXI1z4sukzAb8w1R4eqbsHrAsx06LGYM= k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=