kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 95459fed53
commit 52ef55d653
2 changed files with 21 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
go.mod
View File

@ -16,7 +16,7 @@ require (
github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/fvbommel/sortorder v1.0.1 github.com/fvbommel/sortorder v1.0.1
github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e // indirect github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e // indirect
github.com/google/go-cmp v0.5.4 github.com/google/go-cmp v0.5.2
github.com/googleapis/gnostic v0.5.1 github.com/googleapis/gnostic v0.5.1
github.com/jonboulle/clockwork v0.1.0 github.com/jonboulle/clockwork v0.1.0
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
@ -30,17 +30,17 @@ require (
github.com/spf13/cobra v1.1.1 github.com/spf13/cobra v1.1.1
github.com/spf13/pflag v1.0.5 github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.6.1 github.com/stretchr/testify v1.6.1
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073
gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20210518101626-c10867da44cc k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0-20210518100459-e1b4d3faae10 k8s.io/apimachinery v0.0.0
k8s.io/cli-runtime v0.0.0-20210518124927-56412ce524ff k8s.io/cli-runtime v0.0.0
k8s.io/client-go v0.0.0-20210518102938-da281643cfad k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0-20210518111239-b5a495af30a7 k8s.io/component-base v0.0.0
k8s.io/component-helpers v0.0.0-20210518112018-f97660966ef8 k8s.io/component-helpers v0.0.0
k8s.io/klog/v2 v2.8.0 k8s.io/klog/v2 v2.8.0
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
k8s.io/metrics v0.0.0-20210518124137-92a233db25f4 k8s.io/metrics v0.0.0
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 k8s.io/utils v0.0.0-20201110183641-67b214c5f920
sigs.k8s.io/kustomize/api v0.8.8 sigs.k8s.io/kustomize/api v0.8.8
sigs.k8s.io/kustomize/kustomize/v4 v4.1.2 sigs.k8s.io/kustomize/kustomize/v4 v4.1.2
@ -48,12 +48,13 @@ require (
) )
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20210518101626-c10867da44cc k8s.io/api => ../api
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210518100459-e1b4d3faae10 k8s.io/apimachinery => ../apimachinery
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210518124927-56412ce524ff k8s.io/cli-runtime => ../cli-runtime
k8s.io/client-go => k8s.io/client-go v0.0.0-20210518102938-da281643cfad k8s.io/client-go => ../client-go
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210518095636-66f43cf5fe58 k8s.io/code-generator => ../code-generator
k8s.io/component-base => k8s.io/component-base v0.0.0-20210518111239-b5a495af30a7 k8s.io/component-base => ../component-base
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210518112018-f97660966ef8 k8s.io/component-helpers => ../component-helpers
k8s.io/metrics => k8s.io/metrics v0.0.0-20210518124137-92a233db25f4 k8s.io/kubectl => ../kubectl
k8s.io/metrics => ../metrics
) )

22
go.sum
View File

@ -215,9 +215,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.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.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.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.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.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 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@ -577,8 +576,8 @@ 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-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-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-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 h1:dXfMednGJh/SUUFjTLsWJz3P+TQt9qnR11GgeI3vWKs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 h1:8qxJSnu+7dRq6upnbntrmriWByIakBuct5OM/MdQC1M=
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-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-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE=
@ -732,19 +731,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.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-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= 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/cli-runtime v0.0.0-20210518124927-56412ce524ff h1:uBscAH3DiTAIqjIS7deC7SYXrc2VgKKOvhhsl9WtMzQ=
k8s.io/cli-runtime v0.0.0-20210518124927-56412ce524ff/go.mod h1:Ln/TsIssQxB+8h+R1A4hkzjkimSnWw55ZQVHPat0L/I=
k8s.io/client-go v0.0.0-20210518102938-da281643cfad h1:reCRgZvUBXpaGhjBc5XFM/e6SavlG7ilgo7dHQidzTU=
k8s.io/client-go v0.0.0-20210518102938-da281643cfad/go.mod h1:Y8/rwgywnhsn9QvHYhP7e5N1iHNQARbvb+zdX/zVDn8=
k8s.io/code-generator v0.0.0-20210518095636-66f43cf5fe58/go.mod h1:cAEEkMBZRYUhGRmvroLKYu9Po3yZDphHt1oFt+cBdCM=
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/component-helpers v0.0.0-20210518112018-f97660966ef8 h1:rEoX4qlRyQwMaSJHNQOQNrGQV6Vml9Zpq8ipaGciTLo=
k8s.io/component-helpers v0.0.0-20210518112018-f97660966ef8/go.mod h1:8a+SpphpjyFhgnvI04DIRsgevJ7AVX2oAJEAvBzFa34=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
@ -753,8 +739,6 @@ k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=
k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM=
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
k8s.io/metrics v0.0.0-20210518124137-92a233db25f4 h1:BjR9cPoIL3108uXaWbxWROOjbdLQuKSwL2mdGORSfFM=
k8s.io/metrics v0.0.0-20210518124137-92a233db25f4/go.mod h1:Mi2Xdm7LrxALUsPAz80T62l7wkfx/n0CBTiqOdfmEeU=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw= k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=