From 60738cdb8481cdd435b7758cb5983072cd545499 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 19 May 2021 09:59:29 -0700 Subject: [PATCH] vendor: bump runc to rc95 runc rc95 contains a fix for CVE-2021-30465. runc rc94 provides fixes and improvements. One notable change is cgroup manager's Set now accept Resources rather than Cgroup (see https://github.com/opencontainers/runc/pull/2906). Modify the code accordingly. Also update runc dependencies (as hinted by hack/lint-depdendencies.sh): github.com/cilium/ebpf v0.5.0 github.com/containerd/console v1.0.2 github.com/coreos/go-systemd/v22 v22.3.1 github.com/godbus/dbus/v5 v5.0.4 github.com/moby/sys/mountinfo v0.4.1 golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 github.com/google/go-cmp v0.5.4 github.com/kr/pretty v0.2.1 github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 Signed-off-by: Kir Kolyshkin Kubernetes-commit: 5eea5478ae4859f2d66135d086b9675361d8d2a8 --- go.mod | 33 +++++++++++++++++---------------- go.sum | 23 ++++------------------- 2 files changed, 21 insertions(+), 35 deletions(-) diff --git a/go.mod b/go.mod index 859d3b31..cf8f1275 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/blang/semver v3.5.1+incompatible github.com/dnaeon/go-vcr v1.0.1 // indirect github.com/golang/mock v1.4.4 - github.com/google/go-cmp v0.5.2 + github.com/google/go-cmp v0.5.4 github.com/gophercloud/gophercloud v0.1.0 github.com/mitchellh/mapstructure v1.1.2 github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021 @@ -29,25 +29,26 @@ require ( google.golang.org/api v0.20.0 gopkg.in/gcfg.v1 v1.2.0 gopkg.in/warnings.v0 v0.1.1 // indirect - k8s.io/api v0.0.0-20210518102353-e379db4b881d - k8s.io/apimachinery v0.0.0-20210421190351-be0c81341c37 - k8s.io/apiserver v0.0.0-20210518114404-8b8ee2000e97 - k8s.io/client-go v0.0.0-20210401152202-307e3a38a167 - k8s.io/cloud-provider v0.0.0-20210518133432-dbc5527855e8 - k8s.io/component-base v0.0.0-20210329113144-5feaa80744bd - k8s.io/csi-translation-lib v0.0.0-20210329121000-cbe1afbf2ba1 + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/apiserver v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/cloud-provider v0.0.0 + k8s.io/component-base v0.0.0 + k8s.io/csi-translation-lib v0.0.0 k8s.io/klog/v2 v2.8.0 k8s.io/utils v0.0.0-20201110183641-67b214c5f920 sigs.k8s.io/yaml v1.2.0 ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20210518102353-e379db4b881d - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210421190351-be0c81341c37 - k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210518114404-8b8ee2000e97 - k8s.io/client-go => k8s.io/client-go v0.0.0-20210401152202-307e3a38a167 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210518133432-dbc5527855e8 - k8s.io/component-base => k8s.io/component-base v0.0.0-20210329113144-5feaa80744bd - k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210329120239-80d55f30cc03 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20210329121000-cbe1afbf2ba1 + 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/csi-translation-lib => ../csi-translation-lib + k8s.io/legacy-cloud-providers => ../legacy-cloud-providers ) diff --git a/go.sum b/go.sum index ebd5f3cb..91142361 100644 --- a/go.sum +++ b/go.sum @@ -176,8 +176,8 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -517,8 +517,8 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 h1:8qxJSnu+7dRq6upnbntrmriWByIakBuct5OM/MdQC1M= -golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 h1:dXfMednGJh/SUUFjTLsWJz3P+TQt9qnR11GgeI3vWKs= +golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE= @@ -676,21 +676,6 @@ 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-20210518102353-e379db4b881d h1:DHzIPPwk8Y05yWpj33Kz8KaRnosOODhmDwLAaJjA8Rs= -k8s.io/api v0.0.0-20210518102353-e379db4b881d/go.mod h1:80FDcYLi/0zAklIq9x0fk3F7zTkqxDN4WUvnc7KD0pI= -k8s.io/apimachinery v0.0.0-20210421190351-be0c81341c37 h1:TunYeninmgd1K1OI/QQUDmg0HMhq71kfraPk9EbGlRc= -k8s.io/apimachinery v0.0.0-20210421190351-be0c81341c37/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apiserver v0.0.0-20210518114404-8b8ee2000e97 h1:xA8NZxxo1T/gwVPKOEqvwyJzjxCX2VMu0LDNRkdSMGM= -k8s.io/apiserver v0.0.0-20210518114404-8b8ee2000e97/go.mod h1:FNPQJW36xPyhrU2fc96kO3a6W1aO1pDZPpRtUa4LzlA= -k8s.io/client-go v0.0.0-20210401152202-307e3a38a167 h1:opqPJ8l/hqiKIseiNVxcUiYF0vc8gAcyy/rZZrxseTs= -k8s.io/client-go v0.0.0-20210401152202-307e3a38a167/go.mod h1:0NnunnaJsArENJKmzcOD5u2QcfS7Nf3fIzcyhNQI5GI= -k8s.io/cloud-provider v0.0.0-20210518133432-dbc5527855e8 h1:4bCkKZGDpSWsf2h3aXPP7FJPpMhS2olfdCAYT/s3zYc= -k8s.io/cloud-provider v0.0.0-20210518133432-dbc5527855e8/go.mod h1:4rWHI8BQozqcDENJCyvPb9dMtHtirvQFJRVsXUCyFxw= -k8s.io/component-base v0.0.0-20210329113144-5feaa80744bd h1:tLLDsfLUt36KzVGAhprbwRc2lbhpKjcQbynsk+d+uAU= -k8s.io/component-base v0.0.0-20210329113144-5feaa80744bd/go.mod h1:IEys5YfGZC2nKiSTFY0147SzFCqtO/jiMVVCR8FcTKQ= -k8s.io/controller-manager v0.0.0-20210329120239-80d55f30cc03/go.mod h1:HTkhUX0x/dxec9DZCL8ngsDbIe0l6BYPldcRhDscAU4= -k8s.io/csi-translation-lib v0.0.0-20210329121000-cbe1afbf2ba1 h1:y0PaF5+OvXfPcdq446zUy53Bcl4G8rOx2v3mJ/OqWw4= -k8s.io/csi-translation-lib v0.0.0-20210329121000-cbe1afbf2ba1/go.mod h1:7/fi6TDW7yYohW6Lb1vvZ24bzBQtqJ642lwFiOn5XQk= 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=