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 #102196 from kolyshkin/automated-cherry-pick-of-#102147-upstream-release-1.21 

Automated cherry pick of #102147: vendor: bump runc to rc95

Kubernetes-commit: 133f66aa603c4624ff3544f26f54a153a54c6f94
This commit is contained in:
Kubernetes Publisher 2021-05-21 12:58:11 -07:00
parent 4c06235358
commit f7d2b3051b
3 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Godeps/Godeps.json generated
View File

@ -316,7 +316,7 @@
}, },
{ {
"ImportPath": "github.com/google/go-cmp", "ImportPath": "github.com/google/go-cmp",
"Rev": "v0.5.2" "Rev": "v0.5.4"
}, },
{ {
"ImportPath": "github.com/google/gofuzz", "ImportPath": "github.com/google/gofuzz",
@ -812,7 +812,7 @@
}, },
{ {
"ImportPath": "golang.org/x/sys", "ImportPath": "golang.org/x/sys",
"Rev": "a50acf3fe073" "Rev": "d19ff857e887"
}, },
{ {
"ImportPath": "golang.org/x/term", "ImportPath": "golang.org/x/term",
@ -916,31 +916,31 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "51a1c5553d68" "Rev": "b96220531b73"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "e337f44144a6" "Rev": "1a7b32ce3b15"
}, },
{ {
"ImportPath": "k8s.io/apiserver", "ImportPath": "k8s.io/apiserver",
"Rev": "0eb3da2e7ac5" "Rev": "378b4eb6c840"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "6be0785e0e32" "Rev": "ffd8cfc5638d"
}, },
{ {
"ImportPath": "k8s.io/cloud-provider", "ImportPath": "k8s.io/cloud-provider",
"Rev": "e1a9cf78cc01" "Rev": "c493e4d68cfb"
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"Rev": "9f42c8df41b0" "Rev": "2aef4dc4494b"
}, },
{ {
"ImportPath": "k8s.io/controller-manager", "ImportPath": "k8s.io/controller-manager",
"Rev": "80d55f30cc03" "Rev": "4aefa2f902bd"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",

21
go.mod
View File

@ -5,18 +5,17 @@ module k8s.io/kube-controller-manager
go 1.16 go 1.16
require ( require (
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15
k8s.io/cloud-provider v0.0.0 k8s.io/cloud-provider v0.0.0-20210521235955-c493e4d68cfb
k8s.io/controller-manager v0.0.0 k8s.io/controller-manager v0.0.0-20210521235757-4aefa2f902bd
) )
replace ( replace (
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20210521231242-b96220531b73
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15
k8s.io/apiserver => ../apiserver k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210521233223-378b4eb6c840
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20210521231753-ffd8cfc5638d
k8s.io/cloud-provider => ../cloud-provider k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210521235955-c493e4d68cfb
k8s.io/component-base => ../component-base k8s.io/component-base => k8s.io/component-base v0.0.0-20210521232436-2aef4dc4494b
k8s.io/controller-manager => ../controller-manager k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210521235757-4aefa2f902bd
k8s.io/kube-controller-manager => ../kube-controller-manager
) )

12
go.sum
View File

@ -595,6 +595,18 @@ 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.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-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210521231242-b96220531b73 h1:PuJc9v6ozb0tuojUdhpMpMiLFLy/M8Mc/kwJMkd47no=
k8s.io/api v0.0.0-20210521231242-b96220531b73/go.mod h1:90UO6Ryvwa9Yd0kKCHR1FoS1rzvfolT51aZuTitZqfM=
k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15 h1:8KFyXEHJ9YhaFFEnFRPavjxc7gmLdhiBHAcvXM3ZGd4=
k8s.io/apimachinery v0.0.0-20210521230914-1a7b32ce3b15/go.mod h1:CdTY8fU/BlvAbJ2z/8kBwimGki5Zp8/fbVuLY8gJumM=
k8s.io/apiserver v0.0.0-20210521233223-378b4eb6c840/go.mod h1:thMMP6Gd4e8tjR6w8+4nbLRt3ZcG1pAQ89v2K7szGI4=
k8s.io/client-go v0.0.0-20210521231753-ffd8cfc5638d/go.mod h1:5CwzOhEL+/47w5srOLQwDN6ILFRpFF/4htuyNWtSMcw=
k8s.io/cloud-provider v0.0.0-20210521235955-c493e4d68cfb h1:n55UTuNWHW+DTj7JiqlmteUHjcfT0MwFpxqeCMgT3Ow=
k8s.io/cloud-provider v0.0.0-20210521235955-c493e4d68cfb/go.mod h1:qGIU0/0BTFitwHtq3FeFsxAqfrS3vEKzMun3cC3Zhx4=
k8s.io/component-base v0.0.0-20210521232436-2aef4dc4494b h1:yRafkncohj21ItWfMMLKX3YIrLxrSZaFgUhSi9eBPm0=
k8s.io/component-base v0.0.0-20210521232436-2aef4dc4494b/go.mod h1:tWPM5VVcHmAtb1itx5cU8GYYdfrEgEW4CTP2uYY1xhM=
k8s.io/controller-manager v0.0.0-20210521235757-4aefa2f902bd h1:A8SrVuNyT2Efo9xzTVINYgemf1k5Zy/Gw8ZtOWSXHIg=
k8s.io/controller-manager v0.0.0-20210521235757-4aefa2f902bd/go.mod h1:MLMZMr/aJSt6tW53QBa8skFlpE+wsaJ8pEDvzRQYop4=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= 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.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts= k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=