github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
14,496 Commits 3 Branches 2 Tags 112 MiB
30b929ece7
Commit Graph

14496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maksym Pavlenko
3358f57a77
Merge pull request #10911 from containerd/dependabot/github_actions/github/codeql-action-3.27.0 
build(deps): bump github/codeql-action from 3.26.13 to 3.27.0
 2024-10-30 00:21:44 +00:00
Maksym Pavlenko
bfcab7be79
Merge pull request #10910 from containerd/dependabot/github_actions/actions/checkout-4.2.2 
build(deps): bump actions/checkout from 4.2.1 to 4.2.2
 2024-10-30 00:20:43 +00:00
dependabot[bot]
79089232b4
build(deps): bump actions/checkout from 4.2.1 to 4.2.2 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.1 to 4.2.2.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](eef61447b9...11bd71901b)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-10-29 17:05:49 +00:00
Phil Estes
d257459d50
Merge pull request #10912 from containerd/dependabot/github_actions/actions/cache-4.1.2 
build(deps): bump actions/cache from 4.1.1 to 4.1.2
 2024-10-29 16:28:34 +00:00
dependabot[bot]
2789ba30ee
build(deps): bump actions/cache from 4.1.1 to 4.1.2 
Bumps [actions/cache](https://github.com/actions/cache) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](3624ceb22c...6849a64899)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-10-28 23:51:06 +00:00
dependabot[bot]
6b655d0931
build(deps): bump github/codeql-action from 3.26.13 to 3.27.0 
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.13 to 3.27.0.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](f779452ac5...662472033e)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-10-28 23:51:01 +00:00
Akihiro Suda
9ed6e05b23
config: v1Migrate: support DisabledPlugins and RequiredPlugins 
Fix issue 10905

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2024-10-29 06:51:55 +09:00
Akihiro Suda
4b2bca00b8
config: migrate version before merging 
Prior to this commit, `/etc/containerd/config.toml` with no version
was parsed as version 3.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2024-10-29 06:51:55 +09:00
Akihiro Suda
1e6fdb531b
Merge pull request #10894 from tonistiigi/fix-readonly-contentstore 
local: avoid writing to content root on readonly store
 2024-10-28 19:28:20 +00:00
Derek McGowan
b831e3a55c
Merge pull request #10904 from AkihiroSuda/imgcrypt-v2 
go.mod: github.com/containerd/imgcrypt v2.0.0-rc-1
 2024-10-28 18:18:38 +00:00
Phil Estes
e69a299b5c
Merge pull request #10901 from containerd/dependabot/go_modules/github.com/containerd/continuity-0.4.4 
build(deps): bump github.com/containerd/continuity from 0.4.3 to 0.4.4
 2024-10-28 16:39:06 +00:00
Phil Estes
0d59b84387
Merge pull request #10900 from containerd/dependabot/go_modules/github.com/checkpoint-restore/checkpointctl-1.3.0 
build(deps): bump github.com/checkpoint-restore/checkpointctl from 1.2.1 to 1.3.0
 2024-10-28 16:38:30 +00:00
Akihiro Suda
0208cb58ca
go.mod: github.com/containerd/imgcrypt v2.0.0-rc-1 
https://github.com/containerd/imgcrypt/compare/v1.2.0-rc1...v2.0.0-rc.1

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2024-10-29 01:21:57 +09:00
Akihiro Suda
588b7a100a
testutil: avoid conflict with continuity/testutil 
```
=== FAIL: core/metadata  (0.00s)
/tmp/go-build142702247/b1061/metadata.test flag redefined: test.root
panic: /tmp/go-build142702247/b1061/metadata.test flag redefined: test.root

goroutine 1 [running]:
flag.(*FlagSet).Var(0xc0000d6000, {0x132a040, 0x190f3f3}, {0x11b4291, 0x9}, {0x11c7690, 0x1e})
	/opt/hostedtoolcache/go/1.23.2/x64/src/flag/flag.go:1028 +0x54d
flag.BoolVar(...)
	/opt/hostedtoolcache/go/1.23.2/x64/src/flag/flag.go:755
github.com/containerd/containerd/v2/pkg/testutil.init.0()
	/home/runner/work/containerd/containerd/pkg/testutil/helpers.go:36 +0x6b
FAIL	github.com/containerd/containerd/v2/core/metadata	0.028s
```

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2024-10-28 11:58:28 +09:00
dependabot[bot]
181491032d
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>
 2024-10-28 11:57:48 +09:00
Akihiro Suda
a96eee7b1b
Merge pull request #10899 from thaJeztah/fix_godoc_typo 
pkg/protobuf: fix typo in godoc
 2024-10-28 09:51:15 +09:00
dependabot[bot]
497dc7bf39
build(deps): bump github.com/checkpoint-restore/checkpointctl 
Bumps [github.com/checkpoint-restore/checkpointctl](https://github.com/checkpoint-restore/checkpointctl) from 1.2.1 to 1.3.0.
- [Release notes](https://github.com/checkpoint-restore/checkpointctl/releases)
- [Commits](https://github.com/checkpoint-restore/checkpointctl/compare/v1.2.1...v1.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-10-28 00:48:07 +00:00
Sebastiaan van Stijn
fddeb6f3cb
pkg/protobuf: fix typo in godoc 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-10-26 14:18:53 +02:00
Sebastiaan van Stijn
700b90618d
resolver/docker: fix confusing "trying next host" log 
The resolver uses some log messages to indicate the next host will be used,
however it would print this message even if no next host was available
to try.

This patch changes the log messages to indicate the action taken, which is
either "fetch failed" or if there's no other hosts to try, "trying next host".

While updating, also slightly updated the logs for consistency.

Before this patch:

    DEBU[2024-10-23T20:49:29.640581097Z] resolving                                     host=registry-1.docker.io spanID=6e2b9c871009cfd9 traceID=6c65b97879548fce4372faa8375d17e6
    DEBU[2024-10-23T20:49:29.640632763Z] do request                                    host=registry-1.docker.io request.header.accept="application/vnd.docker.distribution.manifest.v2+json, application/vnd.docker.distribution.manifest.list.v2+json, application/vnd.oci.image.manifest.v1+json, application/vnd.oci.image.index.v1+json, */*" request.header.user-agent="docker/27.3.1 go/go1.22.7 git-commit/41ca978 kernel/6.10.11-linuxkit os/linux arch/arm64 containerd-client/1.7.22+unknown storage-driver/overlayfs UpstreamClient(Docker-Client/27.3.1 \\(linux\\))" request.method=HEAD spanID=6e2b9c871009cfd9 traceID=6c65b97879548fce4372faa8375d17e6 url="https://registry-1.docker.io/v2/library/nosuchimage/manifests/latest"
    DEBU[2024-10-23T20:49:29.979613013Z] fetch response received                       host=registry-1.docker.io response.header.content-length=162 response.header.content-type=application/json response.header.date="Wed, 23 Oct 2024 20:49:29 GMT" response.header.docker-distribution-api-version=registry/2.0 response.header.docker-ratelimit-source=94.210.180.92 response.header.strict-transport-security="max-age=31536000" response.header.www-authenticate="Bearer realm=\"https://auth.docker.io/token\",service=\"registry.docker.io\",scope=\"repository:library/nosuchimage:pull\"" response.status="401 Unauthorized" spanID=6e2b9c871009cfd9 traceID=6c65b97879548fce4372faa8375d17e6 url="https://registry-1.docker.io/v2/library/nosuchimage/manifests/latest"
    DEBU[2024-10-23T20:49:29.979907138Z] Unauthorized                                  header="Bearer realm=\"https://auth.docker.io/token\",service=\"registry.docker.io\",scope=\"repository:library/nosuchimage:pull\"" host=registry-1.docker.io spanID=6e2b9c871009cfd9 traceID=6c65b97879548fce4372faa8375d17e6
    DEBU[2024-10-23T20:49:29.980038430Z] do request                                    host=registry-1.docker.io request.header.accept="application/vnd.docker.distribution.manifest.v2+json, application/vnd.docker.distribution.manifest.list.v2+json, application/vnd.oci.image.manifest.v1+json, application/vnd.oci.image.index.v1+json, */*" request.header.user-agent="docker/27.3.1 go/go1.22.7 git-commit/41ca978 kernel/6.10.11-linuxkit os/linux arch/arm64 containerd-client/1.7.22+unknown storage-driver/overlayfs UpstreamClient(Docker-Client/27.3.1 \\(linux\\))" request.method=HEAD spanID=6e2b9c871009cfd9 traceID=6c65b97879548fce4372faa8375d17e6 url="https://registry-1.docker.io/v2/library/nosuchimage/manifests/latest"
    DEBU[2024-10-23T20:49:30.466825972Z] fetch response received                       host=registry-1.docker.io response.header.content-length=162 response.header.content-type=application/json response.header.date="Wed, 23 Oct 2024 20:49:30 GMT" response.header.docker-distribution-api-version=registry/2.0 response.header.docker-ratelimit-source=94.210.180.92 response.header.strict-transport-security="max-age=31536000" response.header.www-authenticate="Bearer realm=\"https://auth.docker.io/token\",service=\"registry.docker.io\",scope=\"repository:library/nosuchimage:pull\",error=\"insufficient_scope\"" response.status="401 Unauthorized" spanID=6e2b9c871009cfd9 traceID=6c65b97879548fce4372faa8375d17e6 url="https://registry-1.docker.io/v2/library/nosuchimage/manifests/latest"
    DEBU[2024-10-23T20:49:30.467056055Z] Unauthorized                                  header="Bearer realm=\"https://auth.docker.io/token\",service=\"registry.docker.io\",scope=\"repository:library/nosuchimage:pull\",error=\"insufficient_scope\"" host=registry-1.docker.io spanID=6e2b9c871009cfd9 traceID=6c65b97879548fce4372faa8375d17e6
    INFO[2024-10-23T20:49:30.467273305Z] trying next host                              error="pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed" host=registry-1.docker.io spanID=6e2b9c871009cfd9 traceID=6c65b97879548fce4372faa8375d17e6

With this patch:

    DEBU[2024-10-23T21:17:53.487428843Z] resolving                                     host=registry-1.docker.io spanID=4a74f71b08243447 traceID=fc1177ef212d33617c883842b9b9b8db
    DEBU[2024-10-23T21:17:53.487498968Z] do request                                    host=registry-1.docker.io request.header.accept="application/vnd.docker.distribution.manifest.v2+json, application/vnd.docker.distribution.manifest.list.v2+json, application/vnd.oci.image.manifest.v1+json, application/vnd.oci.image.index.v1+json, */*" request.header.user-agent="docker/dev go/go1.22.8 git-commit/06c2ba1fa02626e242dc8dfe888f022bcd247c52 kernel/6.10.11-linuxkit os/linux arch/arm64 containerd-client/1.7.22+unknown storage-driver/overlayfs UpstreamClient(Docker-Client/27.3.1 \\(darwin\\))" request.method=HEAD spanID=4a74f71b08243447 traceID=fc1177ef212d33617c883842b9b9b8db url="https://registry-1.docker.io/v2/library/nosuchimage/manifests/latest"
    DEBU[2024-10-23T21:17:53.832270052Z] fetch response received                       host=registry-1.docker.io response.header.content-length=162 response.header.content-type=application/json response.header.date="Wed, 23 Oct 2024 21:17:53 GMT" response.header.docker-distribution-api-version=registry/2.0 response.header.docker-ratelimit-source=94.210.180.92 response.header.strict-transport-security="max-age=31536000" response.header.www-authenticate="Bearer realm=\"https://auth.docker.io/token\",service=\"registry.docker.io\",scope=\"repository:library/nosuchimage:pull\"" response.status="401 Unauthorized" spanID=4a74f71b08243447 traceID=fc1177ef212d33617c883842b9b9b8db url="https://registry-1.docker.io/v2/library/nosuchimage/manifests/latest"
    DEBU[2024-10-23T21:17:53.832843177Z] Unauthorized                                  header="Bearer realm=\"https://auth.docker.io/token\",service=\"registry.docker.io\",scope=\"repository:library/nosuchimage:pull\"" host=registry-1.docker.io spanID=4a74f71b08243447 traceID=fc1177ef212d33617c883842b9b9b8db
    DEBU[2024-10-23T21:17:53.833364760Z] do request                                    host=registry-1.docker.io request.header.accept="application/vnd.docker.distribution.manifest.v2+json, application/vnd.docker.distribution.manifest.list.v2+json, application/vnd.oci.image.manifest.v1+json, application/vnd.oci.image.index.v1+json, */*" request.header.user-agent="docker/dev go/go1.22.8 git-commit/06c2ba1fa02626e242dc8dfe888f022bcd247c52 kernel/6.10.11-linuxkit os/linux arch/arm64 containerd-client/1.7.22+unknown storage-driver/overlayfs UpstreamClient(Docker-Client/27.3.1 \\(darwin\\))" request.method=HEAD spanID=4a74f71b08243447 traceID=fc1177ef212d33617c883842b9b9b8db url="https://registry-1.docker.io/v2/library/nosuchimage/manifests/latest"
    DEBU[2024-10-23T21:17:54.345483219Z] fetch response received                       host=registry-1.docker.io response.header.content-length=162 response.header.content-type=application/json response.header.date="Wed, 23 Oct 2024 21:17:54 GMT" response.header.docker-distribution-api-version=registry/2.0 response.header.docker-ratelimit-source=4203339e-74c0-11e4-bea4-0242ac11001b response.header.strict-transport-security="max-age=31536000" response.header.www-authenticate="Bearer realm=\"https://auth.docker.io/token\",service=\"registry.docker.io\",scope=\"repository:library/nosuchimage:pull\",error=\"insufficient_scope\"" response.status="401 Unauthorized" spanID=4a74f71b08243447 traceID=fc1177ef212d33617c883842b9b9b8db url="https://registry-1.docker.io/v2/library/nosuchimage/manifests/latest"
    DEBU[2024-10-23T21:17:54.345601386Z] Unauthorized                                  header="Bearer realm=\"https://auth.docker.io/token\",service=\"registry.docker.io\",scope=\"repository:library/nosuchimage:pull\",error=\"insufficient_scope\"" host=registry-1.docker.io spanID=4a74f71b08243447 traceID=fc1177ef212d33617c883842b9b9b8db
    INFO[2024-10-23T21:17:54.345801761Z] fetch failed                                  error="pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed" host=registry-1.docker.io spanID=4a74f71b08243447 traceID=fc1177ef212d33617c883842b9b9b8db

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-10-26 14:16:00 +02:00
Akihiro Suda
cf86af6fcd
Merge pull request #10896 from dmcgowan/update-plugin-1.0.0 
Update containerd plugin to v1.0.0
 2024-10-25 22:44:29 +09:00
Derek McGowan
96a1e498fc
Update containerd plugin to v1.0.0 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-10-25 06:08:01 -07:00
Akihiro Suda
80e93b5694
Merge pull request #10895 from dmcgowan/update-ttrpc-v1.2.6 
Update ttrpc to v1.2.6 tag
 2024-10-25 14:28:27 +09:00
Derek McGowan
3b45a44ccc
Update to ttrpc v1.2.6 tag 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-10-24 21:58:18 -07:00
Tonis Tiigi
3cc2343de0
local: avoid writing to content root on readonly store 
A contentstore can be created on top of readonly path and
should not fail unless there is an attempt to write into it.

Currently this fails because new ingest directory is created
always, meaning for example that you can't create a store to
read blobs from OCI layout without it contaminating the OCI
layout files.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2024-10-24 18:03:09 -07:00
Mike Brown
5a2da171fb
Merge pull request #10793 from arkinmodi/fix-docs-execute-specific-test 
Update sample `go test` commands in BUILDING.md
 2024-10-24 17:25:00 +00:00
Derek McGowan
cf49b3dfb0
Merge pull request #10892 from AkihiroSuda/fix-10889 
Add back ZFS snapshotter
 2024-10-24 17:02:55 +00:00
Akihiro Suda
778defa31f
Add back ZFS snapshotter 
Fix issue 10889

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2024-10-25 00:10:20 +09:00
Derek McGowan
8c98e18a91
Merge pull request #10867 from namespacelabs/main 
Lock store writer per digest and writer.
 2024-10-24 13:55:07 +00:00
Phil Estes
3a89e2e1ce
Merge pull request #10883 from AkihiroSuda/crun 
CI: move crun from Ubuntu to Fedora
 2024-10-24 13:23:23 +00:00
Akihiro Suda
d3ff3e2ff5
CI: move crun from Ubuntu to Fedora 
crun is usually used on Fedora, RHEL, and similar distros.
So it makes more sense to run crun tests on Fedora.

Ubuntu jobs are removed, because inflating the number of the jobs will result
in making the flakiness rate much worse.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2024-10-24 17:56:08 +09:00
Akihiro Suda
b70cce2085
Merge pull request #10887 from dmcgowan/prepare-v2.0.0-rc.6 
Prepare release notes for v2.0.0-rc.6
 2024-10-24 00:23:41 +00:00
Derek McGowan
5c65a3d7b0
Update version to v2.0.0-rc.6 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-10-23 16:47:24 -07:00
Derek McGowan
9aa637b22d
Update api vendor to latest 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2024-10-23 16:47:20 -07:00
Samuel Karp
574f0daa3e
Merge pull request #10884 from samuelkarp/nri-0.7.0 
deps: bump github.com/containerd/nri
 2024-10-23 21:57:45 +00:00
Samuel Karp
4b9d6c0144
deps: bump github.com/containerd/nri 
Fixes https://github.com/containerd/nri/issues/117

Signed-off-by: Samuel Karp <samuelkarp@google.com>
 2024-10-23 13:55:29 -07:00
Maksym Pavlenko
651757761f
Merge pull request #10864 from djdongjin/dedup-cri-util 
Deduplicate some cri util functions
 2024-10-23 20:24:38 +00:00
Niklas Gehlen
2535b187a6
Scope writer locks to each writer. 
Signed-off-by: Niklas Gehlen <niklas@namespacelabs.com>
 2024-10-23 20:40:08 +02:00
Akihiro Suda
deccefc8cf
Merge pull request #9982 from rayburgemeestre/merge-toml-configurations-for-plugins 
Allow sections of Plugins to be merged, and not overwritten as entire sections.
 2024-10-23 04:32:49 +00:00
Akihiro Suda
e370f0e31c
Merge pull request #10882 from samuelkarp/containerd-2.0-guide 
docs: add command for finding schema 1 images
 2024-10-23 13:32:26 +09:00
Samuel Karp
bc819bc97a
docs: add command for finding schema 1 images 
Signed-off-by: Samuel Karp <samuelkarp@google.com>
 2024-10-22 20:44:51 -07:00
Derek McGowan
18654db80a
Merge pull request #10881 from samuelkarp/containerd-2.0-guide 
docs: update min version for deprecation warnings
 2024-10-23 01:37:27 +00:00
Samuel Karp
c86b2772ce
docs: update min version for deprecation warnings 
While some warnings were available in earlier versions, the first
"complete" implementation was in 1.7.12 and 1.6.27.

https://github.com/containerd/containerd/issues/9312 tracks that initial
set of warnings.

Signed-off-by: Samuel Karp <samuelkarp@google.com>
 2024-10-22 15:57:26 -07:00
Akihiro Suda
1d98bad427
Merge pull request #10872 from containerd/dependabot/github_actions/azure/CLI-2.1.0 
build(deps): bump azure/CLI from 1.0.9 to 2.1.0
 2024-10-23 01:09:18 +09:00
Akihiro Suda
1992917779
Merge pull request #10870 from containerd/dependabot/github_actions/actions/upload-artifact-4.4.3 
build(deps): bump actions/upload-artifact from 4.1.0 to 4.4.3
 2024-10-22 14:54:58 +00:00
Derek McGowan
7663dba25f
Merge pull request #10869 from containerd/dependabot/github_actions/github/codeql-action-3.26.13 
build(deps): bump github/codeql-action from 3.24.0 to 3.26.13
 2024-10-22 13:52:09 +00:00
Mike Brown
ce3acc4692
Merge pull request #10878 from AkihiroSuda/crun-1.17 
CI: bump up crun to 1.17
 2024-10-22 13:44:16 +00:00
Derek McGowan
8d641dde78
Merge pull request #10871 from containerd/dependabot/github_actions/actions/checkout-4.2.1 
build(deps): bump actions/checkout from 4.1.1 to 4.2.1
 2024-10-22 13:12:33 +00:00
Derek McGowan
d69e74696e
Merge pull request #10874 from containerd/dependabot/go_modules/github.com/prometheus/client_golang-1.20.5 
build(deps): bump github.com/prometheus/client_golang from 1.20.4 to 1.20.5
 2024-10-22 13:10:10 +00:00
Derek McGowan
6e85807366
Merge pull request #10876 from containerd/dependabot/go_modules/github.com/opencontainers/selinux-1.11.1 
build(deps): bump github.com/opencontainers/selinux from 1.11.0 to 1.11.1
 2024-10-22 13:08:17 +00:00
Akihiro Suda
3d6f2a09cd
Merge pull request #10866 from kiashok/update-hcsshim-0.12.8 
Update hcsshim version to v0.12.8
 2024-10-22 20:00:40 +09:00