github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
11,538 Commits 3 Branches 4 Tags
94c68aa0019dcca11eae8b075b21849f418dadb7
Commit Graph

773 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
93342d637c replace sys Sequential funcs with moby/sys/sequential 
These functions were originally copied from the docker / moby repository in
4a7a8efc2d. Migrating these functions to use the
github.com/moby/sys/sequential module allows them being shared between moby,
docker/cli, and containerd, and to allow using them without importing all of sys
which also depends on hcsshim and more.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-08-29 18:36:34 +02:00
Phil Estes
91b9e5a00d Merge pull request #7315 from AkihiroSuda/runc-1.1.4 
update runc binary to v1.1.4
 2022-08-26 09:39:59 -04:00
Fu Wei
0e7ff59098 Merge pull request #7325 from kzys/upgrade-compress 2022-08-26 21:23:00 +08:00
Kazuyoshi Kato
d063597e80 Upgrade github.com/klauspost/compress from v1.11.13 to v1.15.9 
The package has multiple improvements and bug fixes.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-08-25 22:58:16 +00:00
Akihiro Suda
eb664aed0c go.mod: github.com/opencontainers/runc v1.1.4 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2022-08-26 07:51:16 +09:00
zounengren
49e2fe2abb bump cri-api 
Signed-off-by: zounengren <zouyee1989@gmail.com>
 2022-08-25 21:03:55 +08:00
Samuel Karp
36d0cfd0fd Merge pull request #6517 from ruiwen-zhao/return-resource 2022-08-24 14:01:30 -07:00
Kazuyoshi Kato
470d3ee057 Upgrade containerd/cgroups to remove github.com/cilium/ebpf's fuzzer 
The fuzzer is broken and it breaks OSS-Fuzz according to #7288.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-08-17 21:43:45 +00:00
Daniel Canter
1f8db2467b go.mod: Bump hcsshim to v0.10.0-rc.1 
This contains quite a bit (also bumps google/uuid to 1.3.0). Some HostProcess
container improvements to get ready for whenever it goes to stable in
Kubernetes, Hyper-V (windows) container support for CRI, and a plethora of
other small additions and fixes.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
 2022-08-15 17:03:45 -07:00
ruiwen-zhao
6e4b6830f1 Update CRI-API 
Signed-off-by: ruiwen-zhao <ruiwen@google.com>
 2022-08-10 03:55:51 +00:00
Derek McGowan
6acde90772 Merge pull request #7069 from fuweid/failpoint-in-runc-shimv2 
test: introduce failpoint control to runc-shimv2 and cni
 2022-07-26 23:12:20 -07:00
Daniel Canter
14003683f0 go.mod: Bump hcsshim to v0.9.4 
This tag contains some fixes for hostprocess containers, mainly around
fixing task stats which regressed from a change in v0.9.3.

https://github.com/microsoft/hcsshim/releases/tag/v0.9.4

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
 2022-07-25 13:24:34 -07:00
Daniel Canter
c15d8e1560 go.mod: Bump hcsshim to 0.9.3 
This tag brings in a new field to fix an HNS issue in ws2019 as well as
an optimization for collecting Windows stats (memory, cpu, iops).

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
 2022-07-25 13:03:39 -07:00
Wei Fu
e6a2c07902 integration: simplify CNI-fp and add README.md 
* Use delegated plugin call to simplify cni-bridge-cni
* Add README.md for cni-bridge-cni

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2022-07-24 11:45:45 +08:00
Derek McGowan
1455926416 Merge pull request #7114 from kinvolk/rata/userns-cri 
Update k8s.io/cri-api to v0.25.0-alpha2
 2022-07-20 13:06:58 -07:00
Akihiro Suda
f6bc986dc1 go.mod: github.com/stretchr/testify v1.8.0 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2022-07-20 08:36:10 +09:00
Kazuyoshi Kato
b316318596 Upgrade github.com/AdaLogics/go-fuzz-headers 
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-07-06 15:21:45 +00:00
Rodrigo Campos
b8403d2e15 Update k8s.io/cri-api to v0.25.0-alpha2 
This version contains the CRI changes for user namespaces support.
Future patches will use the new fields in the CRI.

Updating the module without using the new fields doesn't cause any
behaviour change.

Updates: #7063

Signed-off-by: Rodrigo Campos <rodrigoca@microsoft.com>
 2022-06-30 12:09:08 +02:00
Phil Estes
a44cabf517 Update go-restful/v3 to latest release 
Signed-off-by: Phil Estes <estesp@amazon.com>
 2022-06-29 15:23:10 -04:00
Akihiro Suda
c3fb7dfa7f go.mod: github.com/moby/sys/mountinfo v0.6.2 
https://github.com/moby/sys/compare/mountinfo/v0.6.0...mountinfo/v0.6.2

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2022-06-08 13:25:08 +09:00
Kazuyoshi Kato
0532f666f6 Merge pull request #7027 from AkihiroSuda/containerd-cgroup-1.0.4 
go.mod: github.com/containerd/cgroups v1.0.4
 2022-06-07 20:10:33 -07:00
Akihiro Suda
5a6e4144ac go.mod: github.com/containerd/cgroups v1.0.4 
https://github.com/containerd/cgroups/compare/v1.0.3...v1.0.4

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2022-06-07 17:15:21 +09:00
Akihiro Suda
088c8df3ac go.mod: github.com/containerd/continuity v0.3.0 
https://github.com/containerd/continuity/compare/v0.2.2...v0.3.0

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2022-06-07 17:14:08 +09:00
Kazuyoshi Kato
8bf5995e12 Merge pull request #7018 from lucacome/bump-grpc 
Bump grpc to v1.47.0
 2022-06-06 10:04:10 -07:00
Luca Comellini
8bc6ccc073 Bump k8s.io deps to v0.24.1 
Signed-off-by: Luca Comellini <luca.com@gmail.com>
 2022-06-02 15:26:54 -07:00
Luca Comellini
5fcde823dd Bump grpc to v1.47.0 
Signed-off-by: Luca Comellini <luca.com@gmail.com>
 2022-06-02 15:25:37 -07:00
Mike Brown
e3b4d750db update go-cni/for cni update fixing plugins that don't respond with version 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2022-06-01 17:20:18 -05:00
Sebastiaan van Stijn
5bb47fb956 vendor: github.com/urfave/cli v1.22.9 
The regression in v1.22.2 has been resolved, so we can drop the
replace rule and use the latest v1.22.x version.

full diff: https://github.com/urfave/cli/compare/v1.22.1...v1.22.9

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-05-27 13:05:54 +02:00
Phil Estes
133978f893 Merge pull request #6932 from lucacome/bump-otel-deps 
Bump OpenTelemetry dependencies
 2022-05-12 19:28:35 +01:00
Sebastiaan van Stijn
c4ce13a282 vendor: github.com/opencontainers/runc v1.1.2 
no changes in vendored code

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-05-12 13:40:43 +02:00
Luca Comellini
c1140aef65 Bump OpenTelemetry dependencies 
Signed-off-by: Luca Comellini <luca.com@gmail.com>
 2022-05-11 18:03:09 -07:00
Daniel Canter
d1c49781ed go.mod: Bump k8s deps to v0.24.0 
This ends up bumping the prometheus client as well.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
 2022-05-06 13:37:15 -07:00
Mike Brown
6b35307594 Merge pull request #5490 from askervin/5Bu_blockio 
Support for cgroups blockio
 2022-04-29 10:07:56 -05:00
Antti Kervinen
10576c298e cri: support blockio class in pod and container annotations 
This patch adds support for a container annotation and two separate
pod annotations for controlling the blockio class of containers.

The container annotation can be used by a CRI client:
  "io.kubernetes.cri.blockio-class"

Pod annotations specify the blockio class in the K8s pod spec level:
  "blockio.resources.beta.kubernetes.io/pod"
  (pod-wide default for all containers within)

  "blockio.resources.beta.kubernetes.io/container.<container_name>"
  (container-specific overrides)

Correspondingly, this patch adds support for --blockio-class and
--blockio-config-file to ctr, too.

This implementation follows the resource class annotation pattern
introduced in RDT and merged in commit 893701220.

Signed-off-by: Antti Kervinen <antti.kervinen@intel.com>
 2022-04-29 11:44:09 +03:00
Phil Estes
0f5d4ff0ff Merge pull request #6867 from kzys/remove-gogo 
Remove github.com/gogo/protobuf and github.com/golang/protobuf from containerd's direct dependencies
 2022-04-28 15:34:11 +01:00
Michael Zappa
5d0730370d Update go-cni to v1.1.5 
Signed-off-by: Michael Zappa <Michael.Zappa@stateless.net>
 2022-04-27 16:27:10 -06:00
Kazuyoshi Kato
cb84b5a1d2 Merge pull request #6865 from log1cb0mb/bump-opencontainers/selinux-to-v1.10.1 
Bump opencontainers/selinux from 1.10.0 to 1.10.1
 2022-04-27 14:46:21 -07:00
Kazuyoshi Kato
2c6760005c go mod tidy & go mod vendor 
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-04-27 21:31:21 +00:00
log1cb0mb
ae29594d0b Bump opencontainers/selinux from 1.10.0 to 1.10.1 
Signed-off-by: Nabeel Rana <nabeelnrana@gmail.com>
 2022-04-27 22:55:25 +03:00
Kazuyoshi Kato
7f23296b99 Upgrade google.golang.org/grpc and google.golang.org/protobuf 
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-04-27 17:25:02 +00:00
Kazuyoshi Kato
aefd1849b6 go mod tidy and go mod vendor 
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-04-22 15:41:05 +00:00
Kazuyoshi Kato
dfa6e8763e diff: hide types.Any from clients 
This commit hides types.Any from the diff package's interface. Clients
(incl. imgcrypt) shouldn't aware about gogo/protobuf.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-04-21 13:43:20 +00:00
Ed Bartosh
825c1c58a9 CDI: update go.mod and vendor deps 
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
 2022-04-06 13:10:59 +03:00
Maksym Pavlenko
6ccec53d3e Remove gotest.tools 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-04-01 18:18:04 -07:00
Akihiro Suda
11a31320bb go.mod: github.com/opencontainers/runc v1.1.1 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2022-04-01 15:16:08 +09:00
Phil Estes
3633cae64b Merge pull request #6706 from kzys/typeurl-upgrade 
Use typeurl.Any instead of github.com/gogo/protobuf/types.Any
 2022-03-25 10:38:46 -04:00
Kazuyoshi Kato
96b16b447d Use typeurl.Any instead of github.com/gogo/protobuf/types.Any 
This commit upgrades github.com/containerd/typeurl to use typeurl.Any.
The interface hides gogo/protobuf/types.Any from containerd's Go client.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-03-24 20:50:07 +00:00
Mike Brown
a51da91c1d moving up to go-cni v1.1.4 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2022-03-23 22:16:51 +00:00
Sebastiaan van Stijn
36612d692f go.mod: remove replace and update github.com/gogo/googleapis v1.4.1 
gogo/googleapis has a single dependency (github.com/gogo/protobuf), which is
currently the same version as we use, and we have a separate replace for that
dependency, so removing this override should not make a difference there.

gogo/googleapis v1.4.1 Includes updated protos with the gogo/protobuf fixes for
[CVE-2021-3121](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3121)

Change logs and diffs for each release:

- v1.3.3
  generate grpc service for google/longrunning/operations.proto
  full diff: https://github.com/gogo/googleapis/compare/v1.3.2...v1.3.3
- v1.4.0
  Add google geo type
  full diff: https://github.com/gogo/googleapis/compare/v1.3.3...v1.4.0
- v1.4.1
  This release contains sources generated with the version of gogo/protobuf
  containing a fix for the "skippy peanut butter" issue.
  full diff: https://github.com/gogo/googleapis/compare/v1.4.0...v1.4.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-03-23 16:56:30 +01:00
Kazuyoshi Kato
388ee880d2 Upgrade containerd/imgcrypt and opencontainers/image-spec 
- Upgrade github.com/containerd/imgcrypt to prepare for typeurl upgrade
  (see https://github.com/containerd/imgcrypt/pull/72)
- Upgrade github.com/opencontainers/image-spec since imgcrypto needs at
  least 1.0.2.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-03-22 21:17:18 +00:00