github/sample-controller
github/sample-controller
4
0
Fork 0
mirror of https://github.com/kubernetes/sample-controller.git synced 2025-03-31 19:58:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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 94dd24a0a9
commit 69a0df09ef
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Godeps/Godeps.json generated
View File

@ -468,15 +468,15 @@
},
{
"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/code-generator",
@ -512,7 +512,7 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/v4",
"Rev": "v4.0.2"
"Rev": "v4.0.3"
},
{
"ImportPath": "sigs.k8s.io/yaml",

17
go.mod
View File

@ -5,17 +5,16 @@ module k8s.io/sample-controller
go 1.15
require (
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
k8s.io/api v0.0.0-20210325111434-d610c6e6c135
k8s.io/apimachinery v0.0.0-20210325110639-2641dba65d8c
k8s.io/client-go v0.0.0-20210325113704-717704b917f6
k8s.io/code-generator v0.0.0-20210303091831-3f1cbd4ff5a7
k8s.io/klog/v2 v2.4.0
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
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/code-generator => k8s.io/code-generator v0.0.0-20210303091831-3f1cbd4ff5a7
)

4
go.sum
View File

@ -421,6 +421,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/code-generator v0.0.0-20210303091831-3f1cbd4ff5a7/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20201113003025-83324d819ded h1:JApXBKYyB7l9xx+DK7/+mFjC7A9Bt5A93FPvFD0HIFE=
k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=