Commit Graph

14496 Commits

Author SHA1 Message Date
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
Abel Feng
7dadd5f1bf sandbox: remove sandboxStore from podsandbox
Signed-off-by: Abel Feng <fshb1988@gmail.com>
2024-01-09 00:19:17 +08:00
Fu Wei
781d027ba8
Merge pull request #9476 from roman-kiselenko/label-images-on-import
add label flags to ctr import
2024-01-08 09:04:44 +00:00
Akihiro Suda
aa66354c23
Merge pull request #9608 from jsturtevant/update-windows-periodic
[Windows] Use latest VM image in CI to get Windows updates regularly
2024-01-07 20:56:03 +00:00
roman-kiselenko
a3c62e698d add label flags to ctr import, add integration tests
Signed-off-by: roman-kiselenko <roman.kiselenko.dev@gmail.com>
2024-01-06 11:11:10 +03:00
Aditya Ramani
d01056555a Handle failure when stopping a sandbox
Signed-off-by: Aditya Ramani <a_ramani@apple.com>
2024-01-05 13:23:03 -08:00
Phil Estes
0bb7fd36ce
Merge pull request #9603 from thaJeztah/no_execabs
integration: remove use of golang.org/x/sys/execabs
2024-01-05 16:56:43 +00:00
Paweł Gronowski
8235665e7e
content: Add InfoReaderProvider
The interface that combines both content.InfoProvider and
content.Provider was duplicated in multiple places - create one directly
in `content` package and use it instead.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-01-05 16:37:26 +01:00
Sebastiaan van Stijn
fa83bc8de5
integration: remove use of golang.org/x/sys/execabs
This dependency was removed in 2af6db672e, but
was re-introduced in commit 2fab240f21.

Now that golang.org/x/tools also stopped using this dependency, removing
this use will remove the package from our dependency tree.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-01-05 10:05:37 +01:00
Fu Wei
c7c6bb9d13
Merge pull request #9477 from lengrongfu/feat/add-cgroupParent-to-integration
add get cgroupdriver from RuntimeConfig to integration
2024-01-05 03:44:39 +00:00
lengrongfu
dffeea4717 add get cgroupdriver from RuntimeConfig to integration
Signed-off-by: lengrongfu <lenronfu@gmail.com>
2024-01-05 10:58:47 +08:00
James Sturtevant
46b2f1d162
Use latest VM image to get Windows updates regularly
Signed-off-by: James Sturtevant <jstur@microsoft.com>
2024-01-04 21:22:04 +00:00
Fu Wei
287b4cec9b
Merge pull request #9601 from kiashok/cimfsInitFix
Fix CimFS plugin init error
2024-01-04 02:18:14 +00:00
Kirtana Ashok
a8d39666d4 Move cimfs OS build compat check
to the operation functions instead of init()

Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
2024-01-03 16:05:08 -08:00
Maksym Pavlenko
d75bc05ef3
Merge pull request #9554 from vvoland/archive-sparse
import/export: Support references to missing content
2024-01-03 22:45:00 +00:00
Paweł Gronowski
0d3c3efe3b
integration/import-export: Add WithSkipMissing tests
Also refactor tests to use the t.Run and run each test concurrently in a
separate namespace.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-01-03 16:03:38 +01:00
Paweł Gronowski
b9af453f0c
export: Copy distribution source labels to manifest annotations
Persist manifest/indexes distribution source labels as annotations in
the index.json. This could allow the importer to fetch the missing blobs
from the external repository.

These can't really be persisted directly in blob descriptors because
that would alter the digests.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-01-03 16:03:36 +01:00
Paweł Gronowski
61a7c4999c
import/export: Support references to missing content
Allow importing/exporting archives which doesn't have all the referenced
blobs. This allows to export/import an image with only some of the
platforms available locally while still persisting the full index.

> The blobs directory MAY be missing referenced blobs, in which case the missing blobs SHOULD be fulfilled by an external blob store.

https://github.com/opencontainers/image-spec/blob/v1.0/image-layout.md#blobs

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-01-03 16:03:34 +01:00
Fu Wei
f8b07365d2
Merge pull request #9593 from yankay/runc-1.1.11
update runc binary to v1.1.11
2024-01-02 12:52:17 +00:00
Kay Yan
1ab4fac94b update runc binary to v1.1.11
Signed-off-by: Kay Yan <kay.yan@daocloud.io>
2024-01-02 13:36:03 +00:00
Akihiro Suda
c98cb4af22
Merge pull request #9583 from containerd/dependabot/go_modules/github.com/containerd/cgroups/v3-3.0.3
build(deps): bump github.com/containerd/cgroups/v3 from 3.0.2 to 3.0.3
2023-12-30 11:53:12 +00:00
dependabot[bot]
5387747e92
build(deps): bump github.com/containerd/cgroups/v3 from 3.0.2 to 3.0.3
Bumps [github.com/containerd/cgroups/v3](https://github.com/containerd/cgroups) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/containerd/cgroups/releases)
- [Commits](https://github.com/containerd/cgroups/compare/v3.0.2...v3.0.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-29 11:45:53 +00:00
Fu Wei
1f76ca4081
Merge pull request #9581 from bryantbiggs/chore/update-otelgrpc
deps: Update otelgrpc
2023-12-29 09:58:13 +00:00
Bryant Biggs
a1e0601e03 fix: Update go.opentelemetry.io/otel/sdk/trace to satisfy traceProvider interface
Signed-off-by: Bryant Biggs <bryantbiggs@gmail.com>
2023-12-28 09:56:54 -05:00
Bryant Biggs
78421616e0 deps: Update otelgrpc
Signed-off-by: Bryant Biggs <bryantbiggs@gmail.com>
2023-12-28 09:47:05 -05:00
Derek McGowan
ced9b18c23
Merge pull request #9565 from koct9i/fix-return-grpc-code-unavailable-if-not-initialized
fix: return gRPC code "unavailable" if server is not initialized yet
2023-12-28 04:30:43 +00:00
Akihiro Suda
b23a75b611
Merge pull request #9579 from containerd/dependabot/go_modules/github.com/fsnotify/fsnotify-1.7.0
build(deps): bump github.com/fsnotify/fsnotify from 1.6.0 to 1.7.0
2023-12-28 02:10:55 +00:00
Akihiro Suda
ee9638dbba
Merge pull request #9577 from containerd/dependabot/go_modules/github.com/intel/goresctrl-0.6.0
build(deps): bump github.com/intel/goresctrl from 0.5.0 to 0.6.0
2023-12-28 00:29:05 +00:00
dependabot[bot]
bd4c281c56
build(deps): bump github.com/fsnotify/fsnotify from 1.6.0 to 1.7.0
Bumps [github.com/fsnotify/fsnotify](https://github.com/fsnotify/fsnotify) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/fsnotify/fsnotify/releases)
- [Changelog](https://github.com/fsnotify/fsnotify/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fsnotify/fsnotify/compare/v1.6.0...v1.7.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-28 00:05:31 +00:00
dependabot[bot]
62a824a4bd
build(deps): bump github.com/intel/goresctrl from 0.5.0 to 0.6.0
Bumps [github.com/intel/goresctrl](https://github.com/intel/goresctrl) from 0.5.0 to 0.6.0.
- [Release notes](https://github.com/intel/goresctrl/releases)
- [Commits](https://github.com/intel/goresctrl/compare/v0.5.0...v0.6.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-27 22:45:39 +00:00