Commit Graph

764 Commits

Author SHA1 Message Date
Akihiro Suda
ff097d5a4c silence govulncheck false positives
`govulncheck -mode=binary` detected the following vulns, but `-mode=source` says "your code doesn't appear to call these vulnerabilities."

```
=== Symbol Results ===

Vulnerability #1: GO-2025-3503
    HTTP Proxy bypass using IPv6 Zone IDs in golang.org/x/net
  More info: https://pkg.go.dev/vuln/GO-2025-3503
  Module: golang.org/x/net
    Found in: golang.org/x/net@v0.33.0
    Fixed in: golang.org/x/net@v0.36.0
    Vulnerable symbols found:
      #1: httpproxy.config.useProxy
      #2: httpproxy.domainMatch.match
      #3: proxy.Dial
      #4: proxy.FromEnvironment
      #5: proxy.FromEnvironmentUsing
      Use '-show traces' to see the other 3 found symbols

Vulnerability #2: GO-2025-3488
    Unexpected memory consumption during token parsing in golang.org/x/oauth2
  More info: https://pkg.go.dev/vuln/GO-2025-3488
  Module: golang.org/x/oauth2
    Found in: golang.org/x/oauth2@v0.11.0
    Fixed in: golang.org/x/oauth2@v0.27.0
    Vulnerable symbols found:
      #1: jws.Verify

Vulnerability #3: GO-2025-3487
    Potential denial of service in golang.org/x/crypto
  More info: https://pkg.go.dev/vuln/GO-2025-3487
  Module: golang.org/x/crypto
    Found in: golang.org/x/crypto@v0.31.0
    Fixed in: golang.org/x/crypto@v0.35.0
    Vulnerable symbols found:
      #1: ssh.Client.Dial
      #2: ssh.Client.DialContext
      #3: ssh.Client.DialTCP
      #4: ssh.Client.Listen
      #5: ssh.Client.ListenTCP
      Use '-show traces' to see the other 48 found symbols

Your code is affected by 3 vulnerabilities from 3 modules.
This scan found no other vulnerabilities in packages you import or modules you
require.
Use '-show verbose' for more details.
```

NOTE: Go version requirement is now bumped up from 1.21 to 1.23

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2025-04-11 01:48:30 +09:00
Swagat Bora
52dd4dc510 vendor: github.com/go-jose/go-jose/v3 v3.0.4
Signed-off-by: Swagat Bora <sbora@amazon.com>
2025-03-28 22:06:52 +00:00
Jin Dong
fe490b76fd Bump up github.com/intel/goresctrl to 0.5.0
This is the lowest goresctrl version that removed
hashicorp/go-multierror dependency.

This is to fully remove hashicorp/go-multierror dependency.

But this also introduces a few minor version upgrades
of other dependencies.

Signed-off-by: Jin Dong <djdongjin95@gmail.com>
2025-03-06 16:24:20 +00:00
Maksym Pavlenko
ad317d0ab6 Merge pull request #11422 from klihub/fixes/release/1.7/cdi-emfile-sigsegv
[release/1.7] go.{mod,sum}: bump CDI deps to v0.8.1.
2025-03-05 16:43:19 -08:00
Justin Alvarez
3486bc8dd1 Upgrade x/net to 0.33.0
Signed-off-by: Justin Alvarez <alvajus@amazon.com>
2025-02-25 15:45:56 -05:00
Krisztian Litkey
5ba28f8dc1 go.{mod,sum}: bump CDI deps to v0.8.1, re-vendor.
Update CDI dependency to v0.8.1.

Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>
2025-02-24 19:22:26 +02:00
Krisztian Litkey
d4036cd3d1 go.{mod,sum}: bump NRI to v0.8.0, re-vendor.
Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>
2025-02-13 21:12:14 +02:00
Henry Wang
c3e24e0248 Add integ test to check tty leak
Signed-off-by: Henry Wang <henwang@amazon.com>
(cherry picked from commit 652e4d0b10)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
2025-02-11 12:26:36 -07:00
dependabot[bot]
b99091838d build(deps): bump github.com/containerd/continuity from 0.4.3 to 0.4.4
Bumps [github.com/containerd/continuity](https://github.com/containerd/continuity) from 0.4.3 to 0.4.4.
- [Release notes](https://github.com/containerd/continuity/releases)
- [Commits](https://github.com/containerd/continuity/compare/v0.4.3...v0.4.4)

---
updated-dependencies:
- dependency-name: github.com/containerd/continuity
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 181491032d)
Signed-off-by: David Son <davbson@amazon.com>
2025-01-01 20:39:44 -05:00
dependabot[bot]
9f48f7af05 build(deps): bump google.golang.org/protobuf from 1.33.0 to 1.35.2
Bumps google.golang.org/protobuf from 1.33.0 to 1.35.2.

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit dd2d891672)
Signed-off-by: David Son <davbson@amazon.com>
2025-01-01 20:39:42 -05:00
Kohei Tokunaga
79172ba162 go.mod: github.com/containerd/continuity v0.4.3
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
(cherry picked from commit 6da015284c)
Signed-off-by: David Son <davbson@amazon.com>
2025-01-01 20:39:38 -05:00
Maksym Pavlenko
e9ce1e9baa Merge pull request #11178 from ErikJiang/update_crypto
[release/1.7] deps: update golang.org/x/
2024-12-31 13:01:41 -08:00
bo.jiang
2dfbe2c7c1 vendor: update golang.org/x/crypto dependencies
Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
2024-12-20 14:38:33 +08:00
Derek McGowan
929e7bde6d Use api types over deprecated alias
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-12-19 21:58:23 -08:00
Derek McGowan
5a42503d19 Remove end of life api directory
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-12-19 21:58:22 -08:00
Derek McGowan
455787bf80 Make TestContainerPids more resilient
ListPids may not pick up the sh subprocess yet when it is first run. To
make this test more resilient, retry fetching the processes if only a
single pid is found for a short time.

Signed-off-by: Derek McGowan <derek@mcg.dev>
(cherry picked from commit bddeba8250)
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-11-03 21:59:08 -08:00
Derek McGowan
0714a2952a Add errdefs aliases
Update to errdefs 0.3.0 which only includes the main error definitions

Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-10-07 17:28:43 -07:00
Derek McGowan
d8d27205b5 Revert "migrate errdefs package to github.com/containerd/errdefs module"
This reverts commit 47ff8cfce0.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-09-19 22:20:51 -07:00
Derek McGowan
e82d201b3f Revert "replace uses of github.com/containerd/containerd/errdefs"
This reverts commit 308341a446.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-09-19 22:16:33 -07:00
Samuel Karp
0c4ba21d85 integration: regression test for issue 10589
This issue was caused by a race between init exits and new exec process
tracking inside the shim. The test operates by controlling the time
between when the shim invokes "runc exec" and when the actual "runc
exec" is triggered. This allows validating that races for shim state
tracking between pre- and post-start of the exec process do not exist.

Relates to https://github.com/containerd/containerd/issues/10589

Signed-off-by: Samuel Karp <samuelkarp@google.com>
(cherry picked from commit 18725f010b)
Signed-off-by: Samuel Karp <samuelkarp@google.com>
2024-09-06 14:02:37 -07:00
Sebastiaan van Stijn
d63bd84645 go.mod: keep minimum go version at go1.21
Commit 3b263d082c updated the version
of Go used to build containerd to go1.22, but also updated the
version in go.mod.

As there's currently not a requirement for go1.22, we can keep
this at the minimum required version, and revert it to go1.21.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-08-23 22:06:21 +02:00
Akhil Mohan
3b263d082c add go1.23.0, drop go1.21.x
- switch release and build jobs to 1.22.6 from 1.21.13
- add go1.23.0 to CI matrix
- drop go1.21 from CI

Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
2024-08-15 10:20:54 +05:30
Sebastiaan van Stijn
dce0b5a6d3 migrate to github.com/moby/sys/userns
Commit 8437c567d8 migrated the use of the
userns package to the github.com/moby/sys/user module.

After further discussion with maintainers, it was decided to move the
userns package to a separate module, as it has no direct relation with
"user" operations (other than having "user" in its name).

This patch migrates our code to use the new module.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 9776047243)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-08-08 13:10:40 +02:00
Sebastiaan van Stijn
f21675c273 vendor: github.com/moby/sys/user v0.2.0
full diff: https://github.com/moby/sys/compare/user/v0.1.0...user/v0.2.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 40a315b95c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-08-08 12:58:14 +02:00
Bryant Biggs
3a02c523d0 deps: Update otelgrpc
Signed-off-by: Bryant Biggs <bryantbiggs@gmail.com>
(cherry picked from commit 78421616e0)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
2024-07-02 16:08:54 +00:00
Yuanyuan Lei
415dd74a81 updating hcsshim to 0.11.7
Signed-off-by: Yuanyuan Lei <yuanlei@microsoft.com>

go mod tidy for intergration/client

Signed-off-by: Yuanyuan Lei <yuanlei@microsoft.com>

go mod tidy for intergration/client

Signed-off-by: Yuanyuan Lei <yuanlei@microsoft.com>
2024-06-28 10:44:39 -07:00
Derek McGowan
0eb786de66 Update api version to v1.7.19
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-06-26 08:03:11 -07:00
Sebastiaan van Stijn
37926b10d0 vendor: github.com/containerd/ttrpc v1.2.5
full diff: https://github.com/containerd/ttrpc/compare/v1.2.4...v1.2.5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit b323e9eec6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-20 17:03:15 +02:00
Derek McGowan
1fdc9a0556 Merge pull request #10189 from dmcgowan/1.7-api-go-module
[release/1.7] Add API go module
2024-06-19 07:24:33 -07:00
Derek McGowan
a3a7431bc3 Add api go submodule
Allows the api version to be imported and upgraded separately from the
main module.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-06-13 06:22:21 -07:00
Wei Fu
24ce9e4315 integration: backport upgrade testsuite's utils
It's from c75f6d404d/integration/release_upgrade_linux_test.go (L474).

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2024-06-13 15:39:44 +08:00
Wei Fu
79500d5cb2 *: export RemoveVolatileOption for CRI image volumes
Remove volatile option when CRI prepares image volumes.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
(cherry picked from commit 4123170a39)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2024-06-13 15:39:44 +08:00
Fu Wei
727c392cc7 Merge pull request #10311 from dmcgowan/1.7-backport-fail-integration-plugins 2024-06-13 13:57:41 +08:00
Sebastiaan van Stijn
869b786772 vendor: github.com/containerd/platforms v0.2.1
- Remove hcsshim import from repo
    - un-exports GetOsVersion
- Update windows matcher to not compare empty os version

full diff: https://github.com/containerd/platforms/compare/v0.2.0...v0.2.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 87dd4309db)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-13 00:58:28 +02:00
Sebastiaan van Stijn
6ff3e09d20 migrate platforms package to github.com/containerd/platforms
This updates the platforms package to be an alias for the new platforms module.
This helps transitioning consumers to the new module, and makes sure that
containerd v2 and v1 use the same definitions.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-13 00:58:28 +02:00
Akihiro Suda
327a3ac61d go.mod: github.com/klauspost/compress v1.16.7
https://github.com/imdario/mergo/compare/v0.3.13...v1.0.0

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit 1f2216cc78)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-12 22:57:30 +02:00
Sebastiaan van Stijn
d0d1264a65 vendor: github.com/klauspost/compress v1.16.5
partial backport of 56d80f81a2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-12 22:57:27 +02:00
Derek McGowan
40012b6445 Fail integration test early when a plugin load fails
Avoid running tests when a plugin fails to load and return the init
error from the plugin. This prevents the test failing later with an
unhelpful error and attempting to find the actual error in the daemon
logs.

Signed-off-by: Derek McGowan <derek@mcg.dev>
(cherry picked from commit b1a23c495a)
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-06-12 11:09:41 -07:00
Akihiro Suda
e26c152b78 Merge pull request #10316 from thaJeztah/1.7_backport_replace_reference
[release/1.7 backport] replace reference/docker for github.com/distribution/reference v0.6.0
2024-06-11 16:19:46 +09:00
dependabot[bot]
97abbe9cba build(deps): bump github.com/distribution/reference from 0.5.0 to 0.6.0
Bumps [github.com/distribution/reference](https://github.com/distribution/reference) from 0.5.0 to 0.6.0.
- [Release notes](https://github.com/distribution/reference/releases)
- [Commits](https://github.com/distribution/reference/compare/v0.5.0...v0.6.0)

---
updated-dependencies:
- dependency-name: github.com/distribution/reference
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 362fcf2d27)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-08 18:33:30 +02:00
Sebastiaan van Stijn
b38c0f2ef8 replace reference/docker for github.com/distribution/reference v0.5.0
The reference/docker package was a fork of github.com/distribution/distribution,
which could not easily be used as a direct dependency, as it brought many other
dependencies with it.

The "reference' package has now moved to a separate repository, which means
we can replace the local fork, and use the upstream implementation again.

The new module was extracted from the distribution repository at commit:
b9b19409cf

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 4923470902)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-08 18:26:31 +02:00
dependabot[bot]
fef432bfeb build(deps): bump go.etcd.io/bbolt from 1.3.9 to 1.3.10
Bumps [go.etcd.io/bbolt](https://github.com/etcd-io/bbolt) from 1.3.9 to 1.3.10.
- [Release notes](https://github.com/etcd-io/bbolt/releases)
- [Commits](https://github.com/etcd-io/bbolt/compare/v1.3.9...v1.3.10)

---
updated-dependencies:
- dependency-name: go.etcd.io/bbolt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit a6e417dc63)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-08 15:40:50 +02:00
Sebastiaan van Stijn
487c61bfbb vendor: go.etcd.io/bbolt v1.3.9
full diff: https://github.com/etcd-io/bbolt/compare/v1.3.8...v1.3.9

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 154ed26a77)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-08 15:37:50 +02:00
dependabot[bot]
7211f87c48 build(deps): bump golang.org/x/sync from 0.4.0 to 0.5.0
Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.4.0 to 0.5.0.
- [Commits](https://github.com/golang/sync/compare/v0.4.0...v0.5.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sync
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit db43e3d1f7)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-08 15:37:40 +02:00
Sebastiaan van Stijn
e908c3e6fc vendor: golang.org/x/sync v0.4.0
no changes in vendored code

full diff: https://github.com/golang/sync/compare/v0.3.0...v0.4.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-08 15:35:09 +02:00
dependabot[bot]
d814be5ce8 build(deps): bump go.etcd.io/bbolt from 1.3.7 to 1.3.8
Bumps [go.etcd.io/bbolt](https://github.com/etcd-io/bbolt) from 1.3.7 to 1.3.8.
- [Release notes](https://github.com/etcd-io/bbolt/releases)
- [Commits](https://github.com/etcd-io/bbolt/compare/v1.3.7...v1.3.8)

---
updated-dependencies:
- dependency-name: go.etcd.io/bbolt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 39ba0347ee)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-08 15:28:52 +02:00
Sebastiaan van Stijn
0af6825b1e migrate logs imports to github.com/containerd/log module
Import the log module directly, instead of using the aliases that are
provided in the log package. This helps find code-paths that still depend
on the old location, and that haven't migrated yet to the new module.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-05-27 14:38:51 +02:00
Sebastiaan van Stijn
308341a446 replace uses of github.com/containerd/containerd/errdefs
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-05-26 13:21:40 +02:00
Sebastiaan van Stijn
47ff8cfce0 migrate errdefs package to github.com/containerd/errdefs module
This updates the errdefs package to be an alias for the new errdefs module.
This helps transitioning consumers to the new module, and makes sure that
containerd v2 and v1 use the same definitions.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-05-26 13:19:16 +02:00
Derek McGowan
a3c0f2f61e Merge pull request #10232 from kiashok/update-shim-0.11.4
[release/1.7] Update hcsshim tag to v0.11.5
2024-05-15 13:38:14 -07:00