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: 6acb6808a4ce366f66037811a4009d285db951f0
This commit is contained in:
Kubernetes Publisher 2020-08-21 15:45:54 +00:00
parent d01ea7da4a
commit fa4c5c459a
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Godeps/Godeps.json generated
View File

@ -152,7 +152,7 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "162e5629780b"
"Rev": "v4.9.0"
},
{
"ImportPath": "github.com/fsnotify/fsnotify",
@ -274,10 +274,6 @@
"ImportPath": "github.com/imdario/mergo",
"Rev": "v0.3.5"
},
{
"ImportPath": "github.com/jessevdk/go-flags",
"Rev": "v1.4.0"
},
{
"ImportPath": "github.com/json-iterator/go",
"Rev": "v1.1.10"
@ -544,19 +540,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "964aaeff6c60"
"Rev": "21b59c1ded36"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "658236199ef9"
"Rev": "b63a0c883fbf"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "f28aff35751d"
"Rev": "3e55cca68bbc"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "044ed31edf51"
"Rev": "3dc91be9f86c"
},
{
"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-20200821171749-b63a0c883fbf
k8s.io/component-base v0.0.0-20200821173348-3dc91be9f86c
)
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-20200821172135-21b59c1ded36
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200821171749-b63a0c883fbf
k8s.io/client-go => k8s.io/client-go v0.0.0-20200821172742-3e55cca68bbc
k8s.io/component-base => k8s.io/component-base v0.0.0-20200821173348-3dc91be9f86c
)

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-20200821172135-21b59c1ded36/go.mod h1:WXzrXjAr+IgCMGkIbOU4i87rvN7UWNGsyNmBEkW9rx8=
k8s.io/apimachinery v0.0.0-20200821171749-b63a0c883fbf/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
k8s.io/client-go v0.0.0-20200821172742-3e55cca68bbc/go.mod h1:SnLtmp6F+NMdYHYqnSKVWW81iA2wv5QfXXncW8aWuKc=
k8s.io/component-base v0.0.0-20200821173348-3dc91be9f86c/go.mod h1:2biu10irpN6fDj3aQma6z89MIJt4kjKHWeXT391jIJQ=
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=