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

297 Commits

Author SHA1 Message Date
Phil Estes
e0be97ccee Merge pull request #7721 from thaJeztah/protobuf_extensions_fix 
go.mod: golang_protobuf_extensions v1.0.4 - prevent incompatible versions
 2022-11-28 12:22:50 -05:00
Sebastiaan van Stijn
2136736f52 go.mod: golang_protobuf_extensions v1.0.4 - prevent incompatible versions 
This module made a whoopsie, and updated to `google.golang.org/protobuf`
in a patch release, but `google.golang.org/protobuf` is not backward
compatible with `github.com/golang/protobuf`.

Updating the minimum version to v1.0.4 which corrects this, to prevent
users of containerd as a module from accidentally pulling in the wrong
version:

- v1.0.3 switched to use `google.golang.org/protobuf`; https://github.com/matttproud/golang_protobuf_extensions/compare/v1.0.2..v1.0.3
- This was reverted in v1.0.4 (which is the same as v1.0.2); https://github.com/matttproud/golang_protobuf_extensions/compare/v1.0.3..v1.0.4
- And a `v2` was created instead; https://github.com/matttproud/golang_protobuf_extensions/releases/tag/v2.0.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-25 15:06:58 +01:00
Sebastiaan van Stijn
63c6c55ab4 go.mod: roll back github.com/containerd/cgroups to v1.0.4 release 
This was updated in 470d3ee057, but we
only needed the ebpf update. As nothing depends on this module anymore,
other than for the stats package (which didn't change in between), we
can (for now) roll it back to v1.0.4, and just force the newer ebpf
package.

Things rolled back (doesn't affect vendored code);

https://github.com/containerd/cgroups/compare/7083cd60b721..v1.0.4

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-25 10:00:37 +01:00
Sebastiaan van Stijn
3c1c0878e3 integration/client: update containerd version to v1.7.0-beta.0 
While the version isn't used (as it's replaced), let's keep it somewhat
in line with reality :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-25 09:29:03 +01:00
Sebastiaan van Stijn
ebd63adac2 integration/client: fix go.mod grouping 
go.mod doesn't always do a great job on keeping the dependencies grouped in the
right block; 2b60770c4b added an extra "require"
block, after which things went downward.

This patch is grouping them back in the right block to nudge it in the right
direction.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-25 09:22:36 +01:00
AdamKorcz
ed3a49c0e6 fix for OSS-Fuzz infra changes 
Signed-off-by: AdamKorcz <adam@adalogics.com>
 2022-11-22 10:18:28 +00:00
Sebastiaan van Stijn
bd912bbee0 go.mod: github.com/matttproud/golang_protobuf_extensions v1.0.2 
Same commit, but now tagged

diff: https://github.com/matttproud/golang_protobuf_extensions/compare/c182affec369...v1.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-20 22:21:42 +01:00
Sebastiaan van Stijn
5f23daeb26 go.mod: github.com/moby/sys/sequential v0.5.0 
Same commit, but now tagged

diff: https://github.com/moby/sys/compare/b22ba8a69b30...sequential/v0.5.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-20 22:20:47 +01:00
Sebastiaan van Stijn
763ec7c862 go.mod: github.com/cpuguy83/go-md2man/v2 v2.0.2 
it's an indirect dependency, but updating allows us to drop another
dependency.

full diff: https://github.com/cpuguy83/go-md2man/compare/v2.0.0...v2.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-20 22:19:43 +01:00
Sebastiaan van Stijn
0f616e3549 go.mod: github.com/AdaLogics/go-fuzz-headers v0.0.0-20221118232415-3345c89a7c72 
full diff: 443f56ff4b...3345c89a7c

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-20 21:59:44 +01:00
Sebastiaan van Stijn
df4d07352d go.mod: golang.org/x/sys v0.2.0 
full diff: https://github.com/golang/sys/compare/v0.1.0...v0.2.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-20 21:58:02 +01:00
Sebastiaan van Stijn
4e68634ef0 go.mod: github.com/sirupsen/logrus v1.9.0 
full diff: https://github.com/sirupsen/logrus/compare/v1.8.1...v1.9.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-20 21:53:29 +01:00
Akihiro Suda
b9f79d3018 Merge pull request #7703 from yanggangtony/fsnotify 
Fsnotify bump and change code
 2022-11-20 19:50:54 +09:00
yanggang
2cea525eee Bump fsnotify to v1.6.0 
Signed-off-by: yanggang <gang.yang@daocloud.io>
 2022-11-20 09:37:37 +08:00
yanggang
73c6db881b Bump urfave-cli to v1.22.10 
Signed-off-by: yanggang <gang.yang@daocloud.io>
 2022-11-19 15:13:27 +08:00
ruiwen-zhao
792294ce06 Update to cri-api v0.26.0-beta.0 
Signed-off-by: ruiwen-zhao <ruiwen@google.com>
 2022-11-18 21:13:34 +00:00
Derek McGowan
223f67ccdb Merge pull request #7601 from kzys/cgroups-upgrade 
Upgrade github.com/containerd/cgroups from v1 to v3
 2022-11-17 21:55:03 -08:00
Kazuyoshi Kato
6596a70861 Use github.com/containerd/cgroups/v3 to remove gogo 
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-11-14 21:07:48 +00:00
Kazuyoshi Kato
f1162b77a3 Merge pull request #7663 from lucacome/bump-k8s-deps 
Bump k8s.io deps to v0.25.4
 2022-11-14 12:09:56 -08:00
Luca Comellini
38ad785cef Bump k8s.io deps to v0.25.4 
Signed-off-by: Luca Comellini <luca.com@gmail.com>
 2022-11-11 15:13:35 -08:00
Luca Comellini
bd66f588bf Bump OpenTelemetry contrib to v0.36.4 
Signed-off-by: Luca Comellini <luca.com@gmail.com>
 2022-11-11 15:10:38 -08:00
Luca Comellini
b829e6f2d3 Bump OpenTelemetry to v1.11.1 
Signed-off-by: Luca Comellini <luca.com@gmail.com>
 2022-11-10 22:15:10 -08:00
Luca Comellini
ab194e65f9 Bump grpc to v1.50.1 
Signed-off-by: Luca Comellini <luca.com@gmail.com>
 2022-11-09 18:30:31 -08:00
AdamKorcz
b742aa2e77 fuzzing: bump go-fuzz-headers 
Signed-off-by: AdamKorcz <adam@adalogics.com>
 2022-11-09 14:30:30 +00:00
Luca Comellini
202abf8fc1 Bump k8s.io deps to v0.25.3 
Signed-off-by: Luca Comellini <luca.com@gmail.com>
 2022-11-07 15:30:06 -08:00
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
Samuel Karp
d577ef872a Merge pull request #7537 from swagatbora90/fix-client-wait-start 2022-10-26 18:31:19 -07:00
Fu Wei
9b54eee718 Merge pull request #7419 from bart0sh/PR005-configure-CDI-registry-on-start 2022-10-22 08:17:33 +08:00
Swagat Bora
727b33c710 Retry client connection in waitForStart 
Signed-off-by: Swagat Bora <sbora@amazon.com>
 2022-10-19 16:24:07 +00:00
AdamKorcz
9a8611d635 bump go-fuzz-headers 
Signed-off-by: AdamKorcz <adam@adalogics.com>
 2022-10-19 00:13:07 +01:00
Phil Estes
4fdebea98b Merge pull request #7522 from thaJeztah/protobuf_extensions_tag 
go.mod: matttproud/golang_protobuf_extensions v1.0.2 (use tag)
 2022-10-17 09:55:36 -07:00
Sebastiaan van Stijn
6a07a1c070 go.mod: matttproud/golang_protobuf_extensions v1.0.2 (use tag) 
it's the same commit: https://github.com/matttproud/golang_protobuf_extensions/compare/v1.0.2...c182affec369

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-10-17 00:56:34 +02:00
Sebastiaan van Stijn
29c7fc9520 clean-up "nolint" comments, remove unused ones 
- fix "nolint" comments to be in the correct format (`//nolint:<linters>[,<linter>`
  no leading space, required colon (`:`) and linters.
- remove "nolint" comments for errcheck, which is disabled in our config.
- remove "nolint" comments that were no longer needed (nolintlint).
- where known, add a comment describing why a "nolint" was applied.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-10-12 14:40:59 +02: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
Kazuyoshi Kato
260af5e1d2 TestTaskResize must use a terminal 
The test was essentially no-op since it didn't use a terminal.

Fixes #6249.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-10-08 01:39:27 +00: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
Brian Goff
b4558bedc6 Add test flag for skipping shim cgroup test 
For some shims (namely github.com/cpuguy83/containerd-shim-systemd-v1),
the shim cgroup test doesn't make sense since there is only a single
shim process for the entire node.

I use these integration tests to make sure the shim is compatible with
the runc shims and generally works as expected. This will let me skip
the shim cgroup test as there is no process for the shim to stick into
the cgroup... mostly.
There is a bootstrap process as well as a PTY copier proces which do use
the shim cgroup if provided, but the test is not able to check for
those (unless we enable tty on the test, which is a bit arbitrary and
not useful).

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2022-09-23 17:39:04 +00:00
Fu Wei
e94e5b7fb4 Merge pull request #7397 from kzys/remove-deps 
Upgrade fuzzing-related packages to reduce dependencies
 2022-09-19 23:13:44 +08: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
Tiger Kaovilai
524d3aca80 github.com/emicklei/go-restful CWE-285: Improper Authorization 
https://security.snyk.io/vuln/SNYK-GOLANG-GITHUBCOMEMICKLEIGORESTFUL-2435653
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
 2022-09-14 14:38:00 -04: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
Fu Wei
3b569fabeb Merge pull request #7335 from thaJeztah/move_sys_forceremoveall 2022-08-31 07:35:36 +08: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