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 #99040 from apelisse/update-smd-1.19 

Update sigs.k8s.io/structured-merge-diff to v4.0.3

Kubernetes-commit: 3303966843e96f6c6a85d3492ab79f1499989eda
This commit is contained in:
Kubernetes Publisher 2021-03-25 01:57:29 -07:00
parent 940160fcca
commit d9502ea055
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Godeps/Godeps.json generated
View File

@ -540,19 +540,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "2d800ca79443"
"Rev": "83a267c7608c"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "4440c6847dae"
"Rev": "6d69a3e60ee7"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "e9b0f31f935b"
"Rev": "53d96299a20a"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "6401e5fe0504"
"Rev": "ddffa36eac61"
},
{
"ImportPath": "k8s.io/gengo",
@ -576,7 +576,7 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/v4",
"Rev": "v4.0.1"
"Rev": "v4.0.3"
},
{
"ImportPath": "sigs.k8s.io/yaml",

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-20210325110524-6d69a3e60ee7
k8s.io/component-base v0.0.0-20210325114608-ddffa36eac61
)
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-20210325111313-83a267c7608c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210325110524-6d69a3e60ee7
k8s.io/client-go => k8s.io/client-go v0.0.0-20210325113035-53d96299a20a
k8s.io/component-base => k8s.io/component-base v0.0.0-20210325114608-ddffa36eac61
)

4
go.sum
View File

@ -352,6 +352,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-20210325111313-83a267c7608c/go.mod h1:1DpU1b3N0Yzraj30FrBPrxCDWfvjktX1dY26K1fpHLQ=
k8s.io/apimachinery v0.0.0-20210325110524-6d69a3e60ee7/go.mod h1:VEnBy6MjLOiOk/toGgJUL7R55GwMclsrEL3UnsHfn5Y=
k8s.io/client-go v0.0.0-20210325113035-53d96299a20a/go.mod h1:jF80L+0gFc/LFxW+CbF0qmk+PTY7fb31gEuT7CPnU68=
k8s.io/component-base v0.0.0-20210325114608-ddffa36eac61/go.mod h1:AAd86bbPFMnq71YEpPsBoTZqUpZVY5z0nSzNhpsIS9I=
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=