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

[1.24] vendor: bump runc to 1.1.6 

This is a manual backport of PRs 110496 and 117241 to release-1.24 branch.

Fixes the following issues:

* Fix "dbus: connection closed by user" error after dbus daemon restart
* CVE-2023-27561 CVE-2023-25809 CVE-2023-28642: Bump fix runc v1.1.4 -> v1.1.5
* Fixed cgroup removal error when using runc binary >= 1.1.6

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

Kubernetes-commit: bce91ce265ffd74bd426c4f39c63b6971a1c16a6
This commit is contained in:
Kir Kolyshkin 2023-05-09 11:21:56 -07:00 committed by Kubernetes Publisher
parent f170f52c94
commit 1372686a7e
2 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
go.mod
View File

@ -5,9 +5,9 @@ module k8s.io/kube-controller-manager
go 1.19
require (
k8s.io/apimachinery v0.0.0-20230215101806-d5c5f0f1e1fe
k8s.io/cloud-provider v0.0.0-20230215143712-7d1aa792b403
k8s.io/controller-manager v0.0.0-20230215142659-a12d962f321d
k8s.io/apimachinery v0.0.0
k8s.io/cloud-provider v0.0.0
k8s.io/controller-manager v0.0.0
)
require (
@ -18,11 +18,11 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/text v0.8.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/component-base v0.0.0-20230215115746-d5dfc1096c7e // indirect
k8s.io/component-base v0.0.0 // indirect
k8s.io/klog/v2 v2.60.1 // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
@ -30,12 +30,13 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20230215102946-528cd1c260c6
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230215101806-d5c5f0f1e1fe
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230215121847-31ddf15d4b26
k8s.io/client-go => k8s.io/client-go v0.0.0-20230215111426-b4614fd9d3d1
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20230215143712-7d1aa792b403
k8s.io/component-base => k8s.io/component-base v0.0.0-20230215115746-d5dfc1096c7e
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230215120503-0d0777c2f7c4
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20230215142659-a12d962f321d
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/component-helpers => ../component-helpers
k8s.io/controller-manager => ../controller-manager
k8s.io/kube-controller-manager => ../kube-controller-manager
)

17
go.sum
View File

@ -40,8 +40,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@ -50,8 +50,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@ -69,15 +69,6 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
k8s.io/api v0.0.0-20230215102946-528cd1c260c6 h1:57ZZPsuvZHz9fl3v2jUcHkcQO8pMPBuDovAOKCpIsVY=
k8s.io/apimachinery v0.0.0-20230215101806-d5c5f0f1e1fe h1:8HqlbIuY4u8ZghRCMuxhci3NAu4HRWtJd46YMqwU0Xw=
k8s.io/apimachinery v0.0.0-20230215101806-d5c5f0f1e1fe/go.mod h1:Yg8GIoNnVG9af59MrlKMm4Unsw3EBj+MfEBvfSid2/4=
k8s.io/cloud-provider v0.0.0-20230215143712-7d1aa792b403 h1:qkdUn3wJDIMX90FHIRNVYv5iY5PWLMGOeb0LGDm1mL8=
k8s.io/cloud-provider v0.0.0-20230215143712-7d1aa792b403/go.mod h1:g7el0wodqvYR0gfM3X25aGzjz76ECVxIZAeCoFaniPA=
k8s.io/component-base v0.0.0-20230215115746-d5dfc1096c7e h1:T8o7Q0qfMeEIxo5yNQHuGRWk+8NRQdh5T7D3rujmGQo=
k8s.io/component-base v0.0.0-20230215115746-d5dfc1096c7e/go.mod h1:ErUQAzE7yxthCIHtn6I0CpaBH9Xq9tstMaSCaTF2Rnk=
k8s.io/controller-manager v0.0.0-20230215142659-a12d962f321d h1:4kUS/5V+AIkiay1aJIvTWwfeOHETP80QzCQzYT5yHNE=
k8s.io/controller-manager v0.0.0-20230215142659-a12d962f321d/go.mod h1:NHyakYSYU76hxWz9UqpF56WYXhn8OS1jiiz3y2L4RY8=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc=
k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=