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

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 154ecc7a15 dd2643c757
commit d11d4a547a
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Godeps/Godeps.json generated
View File

@ -568,19 +568,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "3632e28821e1"
"Rev": "bed38c9b8815"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "9cd3dcb59ee9"
"Rev": "527a61b4dffe"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "39da00799391"
"Rev": "df50762b9f56"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "a49f91b05020"
"Rev": "bf61fcdb2cb3"
},
{
"ImportPath": "k8s.io/gengo",
@ -612,7 +612,7 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/v4",
"Rev": "v4.0.2"
"Rev": "v4.0.3"
},
{
"ImportPath": "sigs.k8s.io/yaml",

14
go.mod
View File

@ -9,14 +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-20210216172254-3632e28821e1
k8s.io/apimachinery v0.0.0-20210216131905-9cd3dcb59ee9
k8s.io/component-base v0.0.0-20210209114056-a49f91b05020
k8s.io/api v0.0.0-20210217012028-bed38c9b8815
k8s.io/apimachinery v0.0.0-20210217011835-527a61b4dffe
k8s.io/component-base v0.0.0-20210217012751-bf61fcdb2cb3
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20210216172254-3632e28821e1
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210216131905-9cd3dcb59ee9
k8s.io/client-go => k8s.io/client-go v0.0.0-20210216172702-39da00799391
k8s.io/component-base => k8s.io/component-base v0.0.0-20210209114056-a49f91b05020
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/component-base => k8s.io/component-base v0.0.0-20210217012751-bf61fcdb2cb3
)

10
go.sum
View File

@ -458,10 +458,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-20210216172254-3632e28821e1/go.mod h1:DkwCS6DSYBCCGaMUBmCRuhYpu96y1ouvZD8sagCvHXA=
k8s.io/apimachinery v0.0.0-20210216131905-9cd3dcb59ee9/go.mod h1:usCLrfBNFPxV+npBFCgIy08RBKPAhZQyIzwcvPV2eh8=
k8s.io/client-go v0.0.0-20210216172702-39da00799391/go.mod h1:v1VT8y7se6SF4U8bhvNKxhKzrKIwGar9SI0pHgnb7s4=
k8s.io/component-base v0.0.0-20210209114056-a49f91b05020/go.mod h1:2obbX6UCGVs4cZSLH0tOnotvu8nSzowHxNyvM3qCGW8=
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/component-base v0.0.0-20210217012751-bf61fcdb2cb3/go.mod h1:gazbxECw90jDRTaMRWKvkWJtQMg8JkZmQTWfUAvL5gQ=
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.5.0 h1:8mOnjf1RmUPW6KRqQCfYSZq/K20Unmp3IhuZUhxl8KI=
@ -474,6 +474,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sigs.k8s.io/structured-merge-diff/v4 v4.0.2 h1:YHQV7Dajm86OuqnIR6zAelnDWBRjo+YhYV9PmGrh1s8=
sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
sigs.k8s.io/structured-merge-diff/v4 v4.0.3 h1:4oyYo8NREp49LBBhKxEqCulFjg26rawYKrnCmg+Sr6c=
sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=