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

Merge pull request #99038 from apelisse/update-smd-1.20 

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

Kubernetes-commit: 50bfd4da07895e27c05acfc35c5f3ba6571a00c4
This commit is contained in:
Kubernetes Publisher 2021-03-25 01:57:29 -07:00
parent 7433a2d6ab
commit 9bc0032f78
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Godeps/Godeps.json generated
View File

@ -564,19 +564,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "3e193e6ee6c8"
"Rev": "d610c6e6c135"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "dd12c7a65e7f"
"Rev": "2641dba65d8c"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "f511eef1254d"
"Rev": "717704b917f6"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "e0ec2d4eec54"
"Rev": "bf590380a8b5"
},
{
"ImportPath": "k8s.io/gengo",
@ -608,7 +608,7 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/v4",
"Rev": "v4.0.2"
"Rev": "v4.0.3"
},
{
"ImportPath": "sigs.k8s.io/yaml",

15
go.mod
View File

@ -9,15 +9,14 @@ require (
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
google.golang.org/grpc v1.27.1
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/component-base v0.0.0
k8s.io/api v0.0.0-20210325111434-d610c6e6c135
k8s.io/apimachinery v0.0.0-20210325110639-2641dba65d8c
k8s.io/component-base v0.0.0-20210325114654-bf590380a8b5
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base
k8s.io/kubelet => ../kubelet
k8s.io/api => k8s.io/api v0.0.0-20210325111434-d610c6e6c135
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210325110639-2641dba65d8c
k8s.io/client-go => k8s.io/client-go v0.0.0-20210325113704-717704b917f6
k8s.io/component-base => k8s.io/component-base v0.0.0-20210325114654-bf590380a8b5
)

4
go.sum
View File

@ -454,6 +454,10 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
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=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210325111434-d610c6e6c135/go.mod h1:NCJrZTlje+G6WhQAoU2ukD8pk2dIx3OZNX5sIIavqvY=
k8s.io/apimachinery v0.0.0-20210325110639-2641dba65d8c/go.mod h1:Qn71v1tutwDL+WrxaD3Fhp0KQwNP8FGKvuPlmPiBUk8=
k8s.io/client-go v0.0.0-20210325113704-717704b917f6/go.mod h1:DSku1ei/QtNCmrU9VTgRSrYqBaHsB3/hZPg9XpoUSvM=
k8s.io/component-base v0.0.0-20210325114654-bf590380a8b5/go.mod h1:HcqruiW0pyETQYpt0DAAXvPr/vg6k8Z/ksg25UD4Ov0=
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.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=