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 #100784 from kevindelgado/smd-to-4-1-1 

Update structured-merge-diff to v4.1.1

Kubernetes-commit: 442b3218b3d3eecdd9e55bffcb2c6b135f3084b7
This commit is contained in:
Kubernetes Publisher 2021-04-10 19:03:22 -07:00
parent 3e585ab929
commit ddf04e311e
3 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Godeps/Godeps.json generated
View File

@ -916,31 +916,31 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "51a1c5553d68"
"Rev": "6eed676bc189"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "57f2a0733447"
"Rev": "d8cdd62f18c3"
},
{
"ImportPath": "k8s.io/apiserver",
"Rev": "0eb3da2e7ac5"
"Rev": "cba9cd88c4ae"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "f6ce18ae578c"
"Rev": "0bb6464b1348"
},
{
"ImportPath": "k8s.io/cloud-provider",
"Rev": "5a236942a3ca"
"Rev": "6c4b94e92b1e"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "9f42c8df41b0"
"Rev": "18d65a503ea1"
},
{
"ImportPath": "k8s.io/controller-manager",
"Rev": "385c02a3964b"
"Rev": "a7c712bd6b9e"
},
{
"ImportPath": "k8s.io/gengo",
@ -976,7 +976,7 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/v4",
"Rev": "v4.1.0"
"Rev": "v4.1.1"
},
{
"ImportPath": "sigs.k8s.io/yaml",

21
go.mod
View File

@ -5,18 +5,17 @@ module k8s.io/kube-controller-manager
go 1.16
require (
k8s.io/apimachinery v0.0.0
k8s.io/cloud-provider v0.0.0
k8s.io/controller-manager v0.0.0
k8s.io/apimachinery v0.0.0-20210411031630-d8cdd62f18c3
k8s.io/cloud-provider v0.0.0-20210411034841-6c4b94e92b1e
k8s.io/controller-manager v0.0.0-20210411034739-a7c712bd6b9e
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/cloud-provider => ../cloud-provider
k8s.io/component-base => ../component-base
k8s.io/controller-manager => ../controller-manager
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/api => k8s.io/api v0.0.0-20210411031832-6eed676bc189
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210411031630-d8cdd62f18c3
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210411033040-cba9cd88c4ae
k8s.io/client-go => k8s.io/client-go v0.0.0-20210411032117-0bb6464b1348
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210411034841-6c4b94e92b1e
k8s.io/component-base => k8s.io/component-base v0.0.0-20210411032642-18d65a503ea1
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210411034739-a7c712bd6b9e
)

7
go.sum
View File

@ -595,6 +595,13 @@ 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-20210411031832-6eed676bc189/go.mod h1:JXXrMe9Wof3EUw/ssiQP6ll7CtQlIlNU2svwStG2DMg=
k8s.io/apimachinery v0.0.0-20210411031630-d8cdd62f18c3/go.mod h1:CRK4uy8GKqwLtMa4Gj9i/B2EBjcqOsuvwP2xZJWUwmk=
k8s.io/apiserver v0.0.0-20210411033040-cba9cd88c4ae/go.mod h1:ZHAjdFoIgHDKd0yAD6ya8pvCsuYESFy+IkW2TSR7o7I=
k8s.io/client-go v0.0.0-20210411032117-0bb6464b1348/go.mod h1:eNM4jkRT9u9brnTVu+nC+EVJQmxvEgtoC0ZyPrfG3pU=
k8s.io/cloud-provider v0.0.0-20210411034841-6c4b94e92b1e/go.mod h1:UsF9AKec5HiUh+efKcG/6LhiH9orsUH+4AyX8j7+i3I=
k8s.io/component-base v0.0.0-20210411032642-18d65a503ea1/go.mod h1:PRyCZLq8ZOPvC66ZNBDGORsa/8LqizoWzwHZkyxgspw=
k8s.io/controller-manager v0.0.0-20210411034739-a7c712bd6b9e/go.mod h1:vfclNToLxWjsRVAXz9NacVmcwkdg4enexqMqp7NmB3g=
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.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=