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

94 Commits

Author SHA1 Message Date
Swagat Bora
3b87d46ce2 Add tracing spans in CRI image service and pull.go 
Signed-off-by: Swagat Bora <sbora@amazon.com>

Add spans around image unpack operations
Use image.ref to denote image name and image.id for the image config digest
Add top-level spand and record errors in the CRI instrumentation service
 2022-11-03 17:03:43 +00:00
Akihiro Suda
30c3078ae4 go.mod: golang.org/x/*: use tagged versions 
golang.org/x/oauth2 is not updated due to its complex dependencies

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2022-11-03 10:18:31 +09:00
Fu Wei
9b54eee718 Merge pull request #7419 from bart0sh/PR005-configure-CDI-registry-on-start 2022-10-22 08:17:33 +08:00
AdamKorcz
9a8611d635 bump go-fuzz-headers 
Signed-off-by: AdamKorcz <adam@adalogics.com>
 2022-10-19 00:13:07 +01:00
Ed Bartosh
347397cf2f update go.mod and go.sum 
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
 2022-10-12 14:00:59 +03:00
Kevin Parsons
e6b5311508 Merge pull request #7483 from jterry75/jterry75/update_image_config_argsescaped 
Updates oci image config to support upstream ArgsEscaped
 2022-10-11 16:32:31 -07:00
Justin Terry
d4b9dade13 Updates oci image config to support upstream ArgsEscaped 
ArgsEscaped has now been merged into upstream OCI image spec.
This change removes the workaround we were doing in containerd
to deserialize the extra json outside of the spec and instead
just uses the formal spec types.

Signed-off-by: Justin Terry <jlterry@amazon.com>
 2022-10-11 13:29:56 -07:00
Sebastiaan van Stijn
e2d8f3859a vendor: github.com/opencontainers/selinux v1.10.2 
full diff: https://github.com/opencontainers/selinux/compare/v1.10.1...v1.10.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-10-05 22:33:35 +02:00
Daniel Canter
acb2964d65 go.mod: Bump go-winio to v0.6.0 
Some minor improvements, but biggest for here is ErrPipeListenerClosed
is no longer an errors.New where the string matches the text of the now
exported net.ErrClosed in the stdlib, but is just assigned to net.ErrClosed
directly. This should allow us to get rid of the string check for "use of closed
network connection" here now..

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
 2022-09-28 10:30:38 -07:00
Kazuyoshi Kato
f0fbc8dfdc Upgrade fuzzing-related packages to reduce dependencies 
github.com/AdaLogics/go-fuzz-headers and
github.com/AdamKorcz/go-118-fuzz-build have less dependencies in
the last versions.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-09-15 23:25:03 +00:00
Fu Wei
99ee82d0b6 Merge pull request #7374 from soulseen/update-cdi-version 2022-09-07 13:37:41 +08:00
xiaoyang zhu
829dd2145f update cdi version to v0.5.1 
Signed-off-by: xiaoyang zhu <zhuxiaoyang1996@gmail.com>
 2022-09-07 09:34:55 +08:00
Sebastiaan van Stijn
0f743ce4ff vendor: golang.org/x/net v0.0.0-20220906165146-f3363e06e74c 
Update to the latest version that contains a fix for CVE-2022-27664;
f3363e06e7

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-09-06 22:46:21 +02:00
Samuel Karp
1bb39b833e Merge pull request #7346 from kzys/fuzz-enable 2022-08-30 22:33:43 -07:00
Kazuyoshi Kato
17e436c20c Pin github.com/AdamKorcz/go-118-fuzz-build 
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-08-30 17:39:45 +00:00
Phil Estes
455127859b Merge pull request #7342 from tklauser/losetup-unix 
Use ioctl helpers from x/sys/unix
 2022-08-30 12:32:20 -04:00
Tobias Klauser
0c6553bfda go.mod, vendor: bump golang.org/x/sys to latest version 
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
 2022-08-30 10:38:20 +02:00
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
331066f87d update intergration 
Signed-off-by: zounengren <zouyee1989@gmail.com>
 2022-08-25 21:17:59 +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
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
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
Kazuyoshi Kato
2b60770c4b Move container_fuzzer.go under integration/client/ 
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-06-27 22:54:25 +00:00
Kazuyoshi Kato
f91616e45e Copy FuzzConvertManifest from cncf/cncf-fuzzing 
This test is one of the noisiest and should be moved from
cncf/cncf-fuzzing first.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-06-20 23:34:23 +00: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
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
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
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
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
7353006f69 Remove kzys/typeurl 
I forgot to remove my fork from integration/client/go.mod.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-04-27 17:16:51 +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
f616dd471e Upgrade containerd/typeurl 
https://github.com/containerd/typeurl/pull/35 is needed to handle
types generated by protoc-gen-go.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-04-22 15:40:56 +00:00
Kazuyoshi Kato
e044759ebd Upgrade containerd/ttrpc 
protoc-gen-go-ttrpc's generated Go code doesn't work with ttrpc v1.1.0.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-04-22 15:31:52 +00:00
Kazuyoshi Kato
88c0c7201e Consolidate gogo/protobuf dependencies under our own protobuf package 
This would make gogo/protobuf migration easier.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-04-19 15:53:36 +00:00