Revert "Merge pull request 101888 from kolyshkin/update-runc-rc94"

This reverts commit b1b06fe0a4d80ac0fd67fae56f29a3710934a256, reversing
changes made to 382a33986b043f78a42d3d865d0ca383687bf171.

Kubernetes-commit: 4b45d0d921051627c43d5fc014e383a6cb872ade
This commit is contained in:
Jordan Liggitt 2021-05-18 09:12:04 -04:00 committed by Kubernetes Publisher
parent 4634fce408
commit 0b0945e5d2
2 changed files with 14 additions and 25 deletions

21
go.mod
View File

@ -5,17 +5,18 @@ module k8s.io/kube-controller-manager
go 1.16
require (
k8s.io/apimachinery v0.0.0-20210518100459-e1b4d3faae10
k8s.io/cloud-provider v0.0.0-20210518133005-2ce195f838c5
k8s.io/controller-manager v0.0.0-20210518132432-b57a934eadab
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-20210518101626-c10867da44cc
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210518100459-e1b4d3faae10
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210518112846-50f8d1fd272b
k8s.io/client-go => k8s.io/client-go v0.0.0-20210518102938-da281643cfad
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210518133005-2ce195f838c5
k8s.io/component-base => k8s.io/component-base v0.0.0-20210518111239-b5a495af30a7
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210518132432-b57a934eadab
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
)

18
go.sum
View File

@ -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.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M=
github.com/google/go-cmp v0.5.4/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/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-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/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-20210518101626-c10867da44cc h1:510bWkKKqYP3zzNFW8DPeXfnmh9zju11qKKUa5qUkpo=
k8s.io/api v0.0.0-20210518101626-c10867da44cc/go.mod h1:P5u+EC1nZ5lWlCyWiXzEtX9yirKtbaIe++CErN156+k=
k8s.io/apimachinery v0.0.0-20210518100459-e1b4d3faae10 h1:465s1fdYVEp4JupKpOCiNgZqAsrkSj9lBTNKt5+zP2U=
k8s.io/apimachinery v0.0.0-20210518100459-e1b4d3faae10/go.mod h1:u0iY13OJ5iBbRU5jVDn9d/5IQhUVuIpEYgWi4YYI/cc=
k8s.io/apiserver v0.0.0-20210518112846-50f8d1fd272b/go.mod h1:mhwaS+t4XDLFv3skkQJwQ8oxDQHwU/UARUKXa49Hw8Y=
k8s.io/client-go v0.0.0-20210518102938-da281643cfad/go.mod h1:Y8/rwgywnhsn9QvHYhP7e5N1iHNQARbvb+zdX/zVDn8=
k8s.io/cloud-provider v0.0.0-20210518133005-2ce195f838c5 h1:7SkkJECW8zYIWrQATRaqLykpNrDxsqpeugLW7IQ0RLo=
k8s.io/cloud-provider v0.0.0-20210518133005-2ce195f838c5/go.mod h1:6TLBwyF6Z8lOkuR9AZnsmotXDZ29nQV5JA535nsSQIY=
k8s.io/component-base v0.0.0-20210518111239-b5a495af30a7 h1:PSJnEkVhqBqgZkkgYspSntQ4DxPKZfNEKL3LqVnZmxI=
k8s.io/component-base v0.0.0-20210518111239-b5a495af30a7/go.mod h1:ai7xm/T4qbYlvD3ZS6M5M4zcnDGrX0P4i+4583+dxUU=
k8s.io/controller-manager v0.0.0-20210518132432-b57a934eadab h1:tV8qvpP+fEuMUvAivRy276161CEKR0myW3033U34bug=
k8s.io/controller-manager v0.0.0-20210518132432-b57a934eadab/go.mod h1:vRwy6Vd3HU+CUrqbz+psiyJln3Nlttsi+tBehxk21m0=
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=