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 remote-tracking branch 'origin/master' into release-1.19 

Kubernetes-commit: d01fde696783fa58430253dfc3bc375d677c4ba3
This commit is contained in:
Kubernetes Publisher 2020-07-27 08:49:57 +00:00
parent 6bf3a8b6dc
commit cda48be99a
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Godeps/Godeps.json generated
View File

@ -424,7 +424,7 @@
},
{
"ImportPath": "golang.org/x/crypto",
"Rev": "bac4c82f6975"
"Rev": "75b288015ac9"
},
{
"ImportPath": "golang.org/x/exp",
@ -448,7 +448,7 @@
},
{
"ImportPath": "golang.org/x/net",
"Rev": "d3edc9973b7e"
"Rev": "ab3426394381"
},
{
"ImportPath": "golang.org/x/oauth2",
@ -540,19 +540,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "0bfda2331c3c"
"Rev": "83df1b82c014"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "2c8b1211fea9"
"Rev": "7efdc26a675c"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "b6011de30ee5"
"Rev": "7f42acdcbb14"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "947d876bc41b"
"Rev": "83dc39ae1fb7"
},
{
"ImportPath": "k8s.io/gengo",

13
go.mod
View File

@ -5,14 +5,13 @@ module k8s.io/kube-controller-manager
go 1.15
require (
k8s.io/apimachinery v0.0.0
k8s.io/component-base v0.0.0
k8s.io/apimachinery v0.0.0-20200727091313-7efdc26a675c
k8s.io/component-base v0.0.0-20200727092343-83dc39ae1fb7
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/api => k8s.io/api v0.0.0-20200727091507-83df1b82c014
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200727091313-7efdc26a675c
k8s.io/client-go => k8s.io/client-go v0.0.0-20200727091751-7f42acdcbb14
k8s.io/component-base => k8s.io/component-base v0.0.0-20200727092343-83dc39ae1fb7
)

4
go.sum
View File

@ -354,6 +354,10 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
k8s.io/api v0.0.0-20200727091507-83df1b82c014/go.mod h1:6QwFoKNoXWMinlZZwHtDnpsr0l80pKtzo2w7kUsGqZE=
k8s.io/apimachinery v0.0.0-20200727091313-7efdc26a675c/go.mod h1:oE8UQU9DqIIc9PyIEYxTj/oJECzZLymCEU9dL0H4F+o=
k8s.io/client-go v0.0.0-20200727091751-7f42acdcbb14/go.mod h1:oCXN+cFsMM7NXTRHhV//bvRZkVsL8uSBpd2EGxUYH4o=
k8s.io/component-base v0.0.0-20200727092343-83dc39ae1fb7/go.mod h1:ykeCVRbZjqJghq2O7LqCVUGhuf9Iulsm2WDIq8AAGFQ=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=