From 686f142f9b6f9b5226e9be4443281c61cf5a958b Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Sun, 6 Jun 2021 20:13:57 -0700 Subject: [PATCH] vendor: bump runc to 1.0.0 pre This is to check if runc 1.0.0 (to be released shortly) works with k8s. The commands used were (roughly): hack/pin-dependency.sh github.com/opencontainers/runc v1.0.0 hack/lint-dependencies.sh # Follow its recommendations. hack/pin-dependency.sh github.com/cilium/ebpf v0.6.1 hack/pin-dependency.sh github.com/opencontainers/selinux v1.8.2 hack/pin-dependency.sh github.com/sirupsen/logrus v1.8.1 # Recheck. hack/lint-dependencies.sh GO111MODULE=on go mod edit -dropreplace github.com/willf/bitset hack/update-vendor.sh # Recheck. hack/lint-dependencies.sh hack/update-internal-modules.sh # Recheck. hack/lint-dependencies.sh [v2: rebased, updated runc 3a0234e1fe2e82 -> 2f8e8e9d977500] [v3: testing master + runc pr 3019] [v4: updated to 93a01cd4d0b7a0f08a] [v5: updated to f093cca13d3cf8a484] [v6: rebased] [v7: updated to runc v1.0.0] [v8: rebased] Signed-off-by: Kir Kolyshkin Kubernetes-commit: 4e7cf5413d5de4648bf923b34874d8e0d431e98a --- go.mod | 21 +++++++++++---------- go.sum | 13 +------------ 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/go.mod b/go.mod index 4852e83..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-20210630214150-3272933c38f1 - k8s.io/cloud-provider v0.0.0-20210630221206-c05b64353ed9 - k8s.io/controller-manager v0.0.0-20210630221059-68bd7166a747 + 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-20210630214335-e14d3f91c1fb - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210630214150-3272933c38f1 - k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210630215546-6490793cbf59 - k8s.io/client-go => k8s.io/client-go v0.0.0-20210630214605-e9d2f61609b1 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210630221206-c05b64353ed9 - k8s.io/component-base => k8s.io/component-base v0.0.0-20210630215151-284cd21cb037 - k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210630221059-68bd7166a747 + 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 fdb0ad2..4c5eee5 100644 --- a/go.sum +++ b/go.sum @@ -324,6 +324,7 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -678,18 +679,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-20210630214335-e14d3f91c1fb h1:5gLwTuhudEs0MG9K6WSBu+ZU20B/S14sP0LSH8Vvhpk= -k8s.io/api v0.0.0-20210630214335-e14d3f91c1fb/go.mod h1:QUF4odb7cdl7zfuvctTckDbkEtvkCYAh3dFFz2L9tKM= -k8s.io/apimachinery v0.0.0-20210630214150-3272933c38f1 h1:7OgDmfxP0iHGe53HMiXFEPPju/kG6nQG8ygS3teYDsI= -k8s.io/apimachinery v0.0.0-20210630214150-3272933c38f1/go.mod h1:nl5vA2gQ1rZlqYe97ozT8wfbPFvI1zFQ1kilS6u/8Ks= -k8s.io/apiserver v0.0.0-20210630215546-6490793cbf59/go.mod h1:rjmm2kdcbhugL7jJZyjMb4Y9I8fwWoCEtPK/KJCKE7o= -k8s.io/client-go v0.0.0-20210630214605-e9d2f61609b1/go.mod h1:y7pYxLEebfazKsc0Y4PfxgDxDGKL3ICTTL53cr55ay8= -k8s.io/cloud-provider v0.0.0-20210630221206-c05b64353ed9 h1:WWuONTmp1CTBFTqttaEY2saBm8jt61aEREH5n1skQOQ= -k8s.io/cloud-provider v0.0.0-20210630221206-c05b64353ed9/go.mod h1:5y/2nih2RpfXypwDGqtA6LBQh+UPW6ILGyDOdw8Ic8Y= -k8s.io/component-base v0.0.0-20210630215151-284cd21cb037 h1:WyX8Vx493iNqK8fbvH2OLotuD14nub2/v7GC3HTvvHY= -k8s.io/component-base v0.0.0-20210630215151-284cd21cb037/go.mod h1:3WGDFbwm/gsCYsIHucVkTm/+nQakZ/zfRYIGKbACVC8= -k8s.io/controller-manager v0.0.0-20210630221059-68bd7166a747 h1:Py2/4T6xCMdx51GJXi2C3Gu8vo9+EAO/e3M1ZUH7QvE= -k8s.io/controller-manager v0.0.0-20210630221059-68bd7166a747/go.mod h1:ILnWxRXYWQEico+NWZzYjiTexWZv/7/GFuKgxLAI578= 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.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=