From c440be65ad69594f4513da602398c00b2466458f Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Mon, 10 May 2021 18:12:04 -0700 Subject: [PATCH] vendor: bump runc to rc94 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: b49744f177087173d43d7771588d83b9df5a3c0b --- go.mod | 21 +++++++++++---------- go.sum | 18 +++--------------- 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/go.mod b/go.mod index 84788e9..2405d3d 100644 --- a/go.mod +++ b/go.mod @@ -5,17 +5,18 @@ module k8s.io/kube-controller-manager go 1.16 require ( - k8s.io/apimachinery v0.0.0-20210518100451-ec059b16b345 - k8s.io/cloud-provider v0.0.0-20210518133001-d5fe87a5fde0 - k8s.io/controller-manager v0.0.0-20210518132428-79121252e7c1 + k8s.io/apimachinery v0.0.0 + k8s.io/cloud-provider v0.0.0 + k8s.io/controller-manager v0.0.0 ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20210518101556-95cee4894d89 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210518100451-ec059b16b345 - k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210518112738-b8afabd52289 - k8s.io/client-go => k8s.io/client-go v0.0.0-20210518102906-d3fbdeba9a5e - k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210518133001-d5fe87a5fde0 - k8s.io/component-base => k8s.io/component-base v0.0.0-20210518111232-44faecbf614e - k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210518132428-79121252e7c1 + 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 ) diff --git a/go.sum b/go.sum index ab44e54..636bd78 100644 --- a/go.sum +++ b/go.sum @@ -140,8 +140,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= @@ -451,7 +451,7 @@ golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7w 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-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +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/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -598,18 +598,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-20210518101556-95cee4894d89 h1:uQC3v+9tBtiF1mXGGdM3vN7gDW7StAJCFO4sO0USjhE= -k8s.io/api v0.0.0-20210518101556-95cee4894d89/go.mod h1:ZFbvp5WWMe1V9auNefRgVPZzDDSzTMLlulKIDnadhQU= -k8s.io/apimachinery v0.0.0-20210518100451-ec059b16b345 h1:oZsYo/CKdpQiJIYzlW07FuZK8UE43taXkz+pS9H0Phg= -k8s.io/apimachinery v0.0.0-20210518100451-ec059b16b345/go.mod h1:fBRSkoylGO2QUTae8Wb2wac6pZ83/r+tL6HFSXGbzfs= -k8s.io/apiserver v0.0.0-20210518112738-b8afabd52289/go.mod h1:K6AoZZ/D134rDtYDUGKUhsSO8j8zmI6ptSVw1i1BNwc= -k8s.io/client-go v0.0.0-20210518102906-d3fbdeba9a5e/go.mod h1:moENc77cVcXNqvd2/0xRbARMIRzTfo9HrOWpG0JizNw= -k8s.io/cloud-provider v0.0.0-20210518133001-d5fe87a5fde0 h1:UuC175Iln52+mxbSXMaHDRQVNAaWJlRNKcXtlBy1kNw= -k8s.io/cloud-provider v0.0.0-20210518133001-d5fe87a5fde0/go.mod h1:X1BauLJoNfkJh6Whrq7LeEqQV9AyXl/cSWg6yAEZySA= -k8s.io/component-base v0.0.0-20210518111232-44faecbf614e h1:+LvsEqL+o2/s3SNrTdZm22miglZOm3TPof8oO5pa2F8= -k8s.io/component-base v0.0.0-20210518111232-44faecbf614e/go.mod h1:VYU6k+gXEg7lXm+XCubCKvSlHHI9l+JHRJ0Hw4nrjug= -k8s.io/controller-manager v0.0.0-20210518132428-79121252e7c1 h1:pKvdVNzat2mcvt9Yc0e44uJZ01TiSg0XHnHUUXoxPQA= -k8s.io/controller-manager v0.0.0-20210518132428-79121252e7c1/go.mod h1:aNkmWXm0l9c1DVySQKgAl8G26W0A489stW1XkKKqh2E= 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=