kubernetes
/
kube-controller-manager
mirror of https://github.com/kubernetes/kube-controller-manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Kubernetes Publisher 2020-03-19 10:27:54 -07:00
parent a746f77a0e
commit 53b6323c10
3 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Godeps/Godeps.json generated
View File

@ -10,6 +10,10 @@
"ImportPath": "cloud.google.com/go", "ImportPath": "cloud.google.com/go",
"Rev": "v0.38.0" "Rev": "v0.38.0"
}, },
{
"ImportPath": "github.com/Azure/go-ansiterm",
"Rev": "d6e3b3328b78"
},
{ {
"ImportPath": "github.com/Azure/go-autorest/autorest", "ImportPath": "github.com/Azure/go-autorest/autorest",
"Rev": "v0.9.6" "Rev": "v0.9.6"
@ -160,7 +164,7 @@
}, },
{ {
"ImportPath": "github.com/google/go-cmp", "ImportPath": "github.com/google/go-cmp",
"Rev": "v0.3.0" "Rev": "v0.3.1"
}, },
{ {
"ImportPath": "github.com/google/gofuzz", "ImportPath": "github.com/google/gofuzz",
@ -250,6 +254,10 @@
"ImportPath": "github.com/matttproud/golang_protobuf_extensions", "ImportPath": "github.com/matttproud/golang_protobuf_extensions",
"Rev": "v1.0.1" "Rev": "v1.0.1"
}, },
{
"ImportPath": "github.com/moby/term",
"Rev": "672ec06f55cd"
},
{ {
"ImportPath": "github.com/modern-go/concurrent", "ImportPath": "github.com/modern-go/concurrent",
"Rev": "bacd9c7ef1dd" "Rev": "bacd9c7ef1dd"
@ -284,7 +292,7 @@
}, },
{ {
"ImportPath": "github.com/pkg/errors", "ImportPath": "github.com/pkg/errors",
"Rev": "v0.8.0" "Rev": "v0.9.1"
}, },
{ {
"ImportPath": "github.com/pmezard/go-difflib", "ImportPath": "github.com/pmezard/go-difflib",
@ -308,7 +316,7 @@
}, },
{ {
"ImportPath": "github.com/sirupsen/logrus", "ImportPath": "github.com/sirupsen/logrus",
"Rev": "v1.2.0" "Rev": "v1.4.2"
}, },
{ {
"ImportPath": "github.com/spf13/afero", "ImportPath": "github.com/spf13/afero",
@ -414,25 +422,33 @@
"ImportPath": "gopkg.in/yaml.v2", "ImportPath": "gopkg.in/yaml.v2",
"Rev": "v2.2.8" "Rev": "v2.2.8"
}, },
{
"ImportPath": "gotest.tools",
"Rev": "v2.2.0"
},
{
"ImportPath": "gotest.tools/v3",
"Rev": "v3.0.2"
},
{ {
"ImportPath": "honnef.co/go/tools", "ImportPath": "honnef.co/go/tools",
"Rev": "3f1c8253044a" "Rev": "3f1c8253044a"
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "c322e7106b58" "Rev": "eb909d5fe0e7"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "1a505bc60c6d" "Rev": "147abd67b880"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "c426e0f36d6b" "Rev": "365234d2fcf0"
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"Rev": "6639e587ba98" "Rev": "dfc3f1250855"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",

13
go.mod
View File

@ -5,16 +5,15 @@ module k8s.io/kube-controller-manager
go 1.13 go 1.13
require ( require (
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20200319202151-147abd67b880
k8s.io/component-base v0.0.0 k8s.io/component-base v0.0.0-20200319203152-dfc3f1250855
) )
replace ( replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 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 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/api => k8s.io/api v0.0.0-20200319202348-eb909d5fe0e7
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200319202151-147abd67b880
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20200319202630-365234d2fcf0
k8s.io/component-base => ../component-base k8s.io/component-base => k8s.io/component-base v0.0.0-20200319203152-dfc3f1250855
k8s.io/kube-controller-manager => ../kube-controller-manager
) )

4
go.sum
View File

@ -194,6 +194,10 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81
gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= 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-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/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/client-go v0.0.0-20200319202630-365234d2fcf0/go.mod h1:peZZtJ3/dSGdPT/rn6th1avRB2RsAVCjb6uBmwIndho=
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-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=