Commit Graph

13325 Commits

Author SHA1 Message Date
Derek McGowan
57ea8aef3d
Move images to core/images
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-01-17 09:51:26 -08:00
Derek McGowan
913edcd489
Move diff to core/diff
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-01-17 09:51:17 -08:00
Derek McGowan
d14350376e
Move diff/windows to plugins/diff/windows
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-01-17 09:51:08 -08:00
Derek McGowan
2d861b6ead
Move diff/walking to plugins/diff/walking
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-01-17 09:50:59 -08:00
Derek McGowan
aaf6ac04cb
Move diff/lcow to plugins/diff/lcow
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-01-17 09:50:50 -08:00
Derek McGowan
9456048f46
Move containers to core/containers
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-01-17 09:50:40 -08:00
Derek McGowan
21b4f3f0aa
Move content to core/content
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-01-17 09:50:32 -08:00
Derek McGowan
846f7d4e65
Move content/local to plugins/content/local
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-01-17 09:50:23 -08:00
Davanum Srinivas
aad37698ed
Merge pull request #9649 from dims/include-image-name-in-error-message
include image name in error message
2024-01-17 12:19:40 +00:00
Fu Wei
380e78e2bf
Merge pull request #9642 from containerd/dependabot/github_actions/actions/upload-artifact-4
build(deps): bump actions/upload-artifact from 3 to 4
2024-01-17 06:12:00 +00:00
Akihiro Suda
a83449cf11
Merge pull request #9621 from bart0sh/PR011-enable-CDI-by-default
config: enable CDI by default
2024-01-17 00:48:55 +00:00
Davanum Srinivas
725c92e7c7
include image name in error message
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2024-01-16 18:44:55 -05:00
dependabot[bot]
18b0d236cb
build(deps): bump actions/upload-artifact from 3 to 4
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-16 20:52:30 +00:00
Derek McGowan
07362334f0
Merge pull request #9645 from akhilerm/migrate-artifact-action-v4
ci: make artifact name unique in linux integration
2024-01-16 20:15:27 +00:00
Fu Wei
5226864fc6
Merge pull request #9646 from fuweid/debug-log-shim-plugin
runtime/v2: reduce shim plugin log
2024-01-16 15:33:43 +00:00
Phil Estes
64ca9ceeb6
Merge pull request #9643 from containerd/dependabot/github_actions/lycheeverse/lychee-action-1.9.1
build(deps): bump lycheeverse/lychee-action from 1.9.0 to 1.9.1
2024-01-16 15:22:26 +00:00
Wei Fu
f45b46b67f runtime/v2: reduce shim plugin log
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2024-01-16 22:28:16 +08:00
Akhil Mohan
20619a7c9f
ci: make artifact name unique in linux integration
actions/upload-artifact@v4 marks artifacts as immutable. Thus, tests
which use matrix should have a unique artifact name while using
upload-artifact github action

Ref: https://github.com/actions/upload-artifact/releases/tag/v4.0.0
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
2024-01-16 18:30:18 +05:30
dependabot[bot]
2053d91578
build(deps): bump lycheeverse/lychee-action from 1.9.0 to 1.9.1
Bumps [lycheeverse/lychee-action](https://github.com/lycheeverse/lychee-action) from 1.9.0 to 1.9.1.
- [Release notes](https://github.com/lycheeverse/lychee-action/releases)
- [Commits](https://github.com/lycheeverse/lychee-action/compare/v1.9.0...v1.9.1)

---
updated-dependencies:
- dependency-name: lycheeverse/lychee-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-16 00:03:52 +00:00
Akihiro Suda
f1e6cc3784
Merge pull request #9640 from fuweid/fix-9638
mount: UnmountRecursive return nil if path doesn't exist
2024-01-15 23:11:13 +00:00
Wei Fu
d4396c96bf mount: UnmountRecursive return nil if path doesn't exist
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2024-01-15 21:48:24 +08:00
Maksym Pavlenko
4dcfd5bf6e
Merge pull request #8355 from Jenkins-J/move-DefaultSnapshotter
Move DefaultSnapshotter constants
2024-01-12 22:18:33 +00:00
James Jenkins
8aa2551ce0 Move DefaultSnapshotter constants
Move the DefaultSnapshotter constants to the defaults package.
Fixes issue #8226.

Signed-off-by: James Jenkins <James.Jenkins@ibm.com>
2024-01-12 13:28:46 -05:00
Ed Bartosh
c8e8a093ce config: enable CDI by default
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
2024-01-12 09:31:39 +02:00
Fu Wei
0a7c192ca9
Merge pull request #9630 from AkihiroSuda/transfer-desc
transfer: add OCI descriptors to Progress structure
2024-01-12 02:40:13 +00:00
Fu Wei
63e0ecd4b0
Merge pull request #9152 from dmcgowan/cri-split-image-service
Split CRI image service from GRPC handler
2024-01-12 02:18:50 +00:00
Derek McGowan
5a3d3f6138
Update load image test to use local import
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-01-11 09:55:10 -08:00
Derek McGowan
6041d4e60c
Update fuzz contrib for updated image service
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-01-11 09:55:10 -08:00
Derek McGowan
2a476d4214
Move ParseImageReferences to cri util
Avoids importing image service for utility function.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-01-11 09:55:10 -08:00
Derek McGowan
3baf5edb8b
Separate the CRI image config from the main plugin config
This change simplifies the CRI plugin dependencies by not requiring the
CRI image plugin to depend on any other CRI components. Since other CRI
plugins depend on the image plugin, this allows prevents a dependency
cycle for CRI configurations on a base plugin.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-01-11 09:55:09 -08:00
Derek McGowan
ad4c9f8a9d
Update CRI runtime platform and pinned image configuration
Updates the CRI image service to own image related configuration and
separate it from the runtime configuration.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-01-11 09:55:09 -08:00
Derek McGowan
11f311fdd5
Add minimal interface to CRI image store
Avoid requiring the whole image store interface for
the image store cache which only needs Get.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-01-11 09:55:09 -08:00
Derek McGowan
02a9a456e1
Split image config from CRI plugin
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-01-11 09:55:09 -08:00
Derek McGowan
d23ac1122e
Split CRI image service from GRPC handler
Prepares the CRI image service for splitting CRI into multiple plugins.
Also prepares for config migration which will spread across multiple
different plugins.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-01-11 09:55:08 -08:00
Akihiro Suda
a2472c0b5a
transfer: add OCI descriptors to Progress structure
The index media type and the digest are now shown in `ctr images pull --local=false`

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2024-01-11 23:56:13 +09:00
Samuel Karp
a2f167e836
Merge pull request #9626 from kiashok/debugToTraceLogs
Move certain debug  level logs to trace level logs
2024-01-11 05:35:21 +00:00
Kirtana Ashok
f261969507 Move certain debug logs to trace logs
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
2024-01-10 14:43:54 -08:00
Phil Estes
cf9aec3185
Merge pull request #9619 from wojiushixiaobai/patch-imgcrypt
build(deps): bump github.com/containerd/imgcrypt to v1.1.9
2024-01-10 10:44:10 -05:00
Phil Estes
25252e9790
Merge pull request #9623 from thaJeztah/update_golang_1.21.6
update to go1.21.6, go1.20.13
2024-01-10 15:05:00 +00:00
Sebastiaan van Stijn
a5d9587061
update to go1.21.6, go1.20.13
go1.21.6 (released 2024-01-09) includes fixes to the compiler, the runtime, and
the crypto/tls, maps, and runtime/pprof packages. See the Go 1.21.6 milestone on
our issue tracker for details:

- https://github.com/golang/go/issues?q=milestone%3AGo1.21.6+label%3ACherryPickApproved
- full diff: https://github.com/golang/go/compare/go1.21.5...go1.21.6

go1.20.13 (released 2024-01-09) includes fixes to the runtime and the crypto/tls
package. See the Go 1.20.13 milestone on our issue tracker for details:

- https://github.com/golang/go/issues?q=milestone%3AGo1.20.13+label%3ACherryPickApproved
- full diff: https://github.com/golang/go/compare/go1.20.12...go1.20.13

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-01-10 10:42:07 +01:00
Derek McGowan
5232e1322c
Merge pull request #9615 from containerd/dependabot/github_actions/lycheeverse/lychee-action-1.9.0
build(deps): bump lycheeverse/lychee-action from 1.8.0 to 1.9.0
2024-01-10 04:54:48 +00:00
Derek McGowan
e8b49bc7f7
Merge pull request #9616 from containerd/dependabot/go_modules/golang-x-991d048ba7
build(deps): bump the golang-x group with 2 updates
2024-01-10 04:54:16 +00:00
Phil Estes
dd7f7bdc0e
Merge pull request #9288 from kiashok/updateCI-main
Uninstall mingw before attempting upgrade
2024-01-09 19:46:42 +00:00
Kirtana Ashok
21640c57a8 Uninstall mingw before attempting upgrade
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
2024-01-09 09:14:05 -08:00
Fu Wei
46bca49bfc
Merge pull request #9611 from adityaramani/main
Handle failure when stopping a sandbox
2024-01-09 15:11:07 +00:00
吴小白
174efb1e02 update imgcrypt binary to v1.1.9
Signed-off-by: 吴小白 <296015668@qq.com>
2024-01-09 15:40:32 +08:00
Fu Wei
9f8b845334
Merge pull request #9463 from abel-von/sandbox-plugin-1205
sandbox: remove sandboxStore from podsandbox controller
2024-01-09 01:40:10 +00:00
dependabot[bot]
dfb1753800
build(deps): bump the golang-x group with 2 updates
Bumps the golang-x group with 2 updates: [golang.org/x/sync](https://github.com/golang/sync) and [golang.org/x/sys](https://github.com/golang/sys).


Updates `golang.org/x/sync` from 0.5.0 to 0.6.0
- [Commits](https://github.com/golang/sync/compare/v0.5.0...v0.6.0)

Updates `golang.org/x/sys` from 0.15.0 to 0.16.0
- [Commits](https://github.com/golang/sys/compare/v0.15.0...v0.16.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-08 23:48:26 +00:00
dependabot[bot]
2b415c911b
build(deps): bump lycheeverse/lychee-action from 1.8.0 to 1.9.0
Bumps [lycheeverse/lychee-action](https://github.com/lycheeverse/lychee-action) from 1.8.0 to 1.9.0.
- [Release notes](https://github.com/lycheeverse/lychee-action/releases)
- [Commits](https://github.com/lycheeverse/lychee-action/compare/v1.8.0...v1.9.0)

---
updated-dependencies:
- dependency-name: lycheeverse/lychee-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-08 23:35:08 +00:00
Derek McGowan
ddfa334a85
Merge pull request #9607 from vvoland/contentprovider
content: Add InfoReaderProvider
2024-01-08 22:42:15 +00:00