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

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 <kolyshkin@gmail.com>

Kubernetes-commit: f3cdfc488e88714f2fe695e35ad0d3f8e45ddc25
This commit is contained in:
Kir Kolyshkin 2021-05-19 09:59:29 -07:00 committed by Kubernetes Publisher
parent bbf80d2fca
commit 833f4d6bb8
2 changed files with 22 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
go.mod
View File

@ -15,7 +15,7 @@ require (
github.com/fatih/camelcase v1.0.0
github.com/fvbommel/sortorder v1.0.1
github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e // indirect
github.com/google/go-cmp v0.5.2
github.com/google/go-cmp v0.5.4
github.com/googleapis/gnostic v0.5.1
github.com/jonboulle/clockwork v0.1.0
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
@ -29,17 +29,17 @@ require (
github.com/spf13/cobra v1.1.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20210519190848-d5fda5562a2e
k8s.io/apimachinery v0.0.0-20210519190646-c7322e849168
k8s.io/cli-runtime v0.0.0-20210519193311-742f66824d8e
k8s.io/client-go v0.0.0-20210519191142-b0c8a7cef141
k8s.io/component-base v0.0.0-20210519191730-8b08f85f6db5
k8s.io/component-helpers v0.0.0-20210519191838-41eea304b4c6
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/cli-runtime v0.0.0
k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0
k8s.io/component-helpers v0.0.0
k8s.io/klog/v2 v2.8.0
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
k8s.io/metrics v0.0.0-20210519193154-d4f6f0e322cf
k8s.io/metrics v0.0.0
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
sigs.k8s.io/kustomize/api v0.8.8
sigs.k8s.io/kustomize/kustomize/v4 v4.1.2
@ -47,12 +47,13 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20210519190848-d5fda5562a2e
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210519190646-c7322e849168
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210519193311-742f66824d8e
k8s.io/client-go => k8s.io/client-go v0.0.0-20210519191142-b0c8a7cef141
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210519190450-deed3360ef40
k8s.io/component-base => k8s.io/component-base v0.0.0-20210519191730-8b08f85f6db5
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210519191838-41eea304b4c6
k8s.io/metrics => k8s.io/metrics v0.0.0-20210519193154-d4f6f0e322cf
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/cli-runtime => ../cli-runtime
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/component-base => ../component-base
k8s.io/component-helpers => ../component-helpers
k8s.io/kubectl => ../kubectl
k8s.io/metrics => ../metrics
)

22
go.sum
View File

@ -215,8 +215,9 @@ 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=
@ -584,8 +585,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-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 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=
@ -739,19 +740,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-20210519190848-d5fda5562a2e h1:NqV6nJIdQDUI6QvFuT+QDcc2s3kcWYUecGbTc74Y4GU=
k8s.io/api v0.0.0-20210519190848-d5fda5562a2e/go.mod h1:pYZcnMa1kuzJ76ydALsvcwPMSsRcNNkhMonm1K/9Umo=
k8s.io/apimachinery v0.0.0-20210519190646-c7322e849168 h1:mkBvQhy9WPz7t0Y3Muea1rVq2TRB91wvC8iE8xpbfl4=
k8s.io/apimachinery v0.0.0-20210519190646-c7322e849168/go.mod h1:4rwBOLnlX0KG0S4eNjF9Aw8Y92JlZQe1fX+e7TeGWQE=
k8s.io/cli-runtime v0.0.0-20210519193311-742f66824d8e h1:myRSDPnGPWXLCjdpd498tlCXUXxz2GpFCAL88p3u+SU=
k8s.io/cli-runtime v0.0.0-20210519193311-742f66824d8e/go.mod h1:R4IDwVAM7/NYJwOasXGaDgKhY1IN5qDe0aCfhvcyjvg=
k8s.io/client-go v0.0.0-20210519191142-b0c8a7cef141 h1:5BYLcOnAmuK8uH77cStSu8prBPQ1B3e8j9Sr9P3R2rQ=
k8s.io/client-go v0.0.0-20210519191142-b0c8a7cef141/go.mod h1:ivtaxlOm0rw7eIAy6tUle/YMhQS+k4qdRVfmUtc5ccM=
k8s.io/code-generator v0.0.0-20210519190450-deed3360ef40/go.mod h1:urDPNwb6GPjvEZfcO5Gtfz/W7yVqc4s4lgZbxuPCiJw=
k8s.io/component-base v0.0.0-20210519191730-8b08f85f6db5 h1:hZyg3j2gVMCWnskmW3xhru5+QT65sJxvE8gnJAa7cOU=
k8s.io/component-base v0.0.0-20210519191730-8b08f85f6db5/go.mod h1:nQZK7G4tfT/SzzvhPuplAUyGMLzSR2hc4xDXQoZVICg=
k8s.io/component-helpers v0.0.0-20210519191838-41eea304b4c6 h1:uAkyOIsXNUesNq/u6HGtxEpELYOO3eN9Jh9a+ctP6YU=
k8s.io/component-helpers v0.0.0-20210519191838-41eea304b4c6/go.mod h1:a/3MnfKwYiUpO/lUM2l/3LqEKGt6VUpwbdFiTUXjp78=
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/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
@ -760,8 +748,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/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/metrics v0.0.0-20210519193154-d4f6f0e322cf h1:c1L/wSia3d5UY4IpPFjugeBdz/+BWp7EaZg7nv4c9j4=
k8s.io/metrics v0.0.0-20210519193154-d4f6f0e322cf/go.mod h1:/pH5EG6s+WMy0AZilK4aoOBJVH5sXVUXuuyx7dgLG6w=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
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=