Merge pull request #99014 from apelisse/update-smd

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

Kubernetes-commit: 93252fa433214462e61495a63e792b756fd6777a
This commit is contained in:
Kubernetes Publisher 2021-02-16 16:39:18 -08:00
parent fd70eb81d6
commit 80a6a3c0f8
3 changed files with 17 additions and 14 deletions

10
Godeps/Godeps.json generated
View File

@ -468,19 +468,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "48bd8381a38a"
"Rev": "bed38c9b8815"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "c93b0f84892e"
"Rev": "527a61b4dffe"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "100613764a76"
"Rev": "df50762b9f56"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "575533eae677"
"Rev": "5a6947c9f285"
},
{
"ImportPath": "k8s.io/gengo",
@ -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-20210217012028-bed38c9b8815
k8s.io/apimachinery v0.0.0-20210217011835-527a61b4dffe
k8s.io/client-go v0.0.0-20210217012314-df50762b9f56
k8s.io/code-generator v0.0.0-20210217003918-5a6947c9f285
k8s.io/klog/v2 v2.5.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-20210217012028-bed38c9b8815
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210217011835-527a61b4dffe
k8s.io/client-go => k8s.io/client-go v0.0.0-20210217012314-df50762b9f56
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210217003918-5a6947c9f285
)

4
go.sum
View File

@ -423,6 +423,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-20210217012028-bed38c9b8815/go.mod h1:60tmSUpHxGPFerNHbo/ayI2lKxvtrhbxFyXuEIWJd78=
k8s.io/apimachinery v0.0.0-20210217011835-527a61b4dffe/go.mod h1:Z7ps/g0rjlTeMstYrMOUttJfT2Gg34DEaG/f2PYLCWY=
k8s.io/client-go v0.0.0-20210217012314-df50762b9f56/go.mod h1:HZqZ8L/2jv2Wi5paCJ2WsQsjG4snn1a9L7hDHac/GNM=
k8s.io/code-generator v0.0.0-20210217003918-5a6947c9f285/go.mod h1:O7FXIFFMbeLstjVDD1gKtnexuIo2JF8jkudWpXyjVeo=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw=
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=