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

14651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek McGowan
a8082cd60d
Prepare release notes for v2.0.5 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2025-04-16 21:55:18 -07:00
Phil Estes
ab513cdec2
Merge pull request #11710 from dmcgowan/backport-11707 
[release/2.0] Disable criu test on arm64
 2025-04-16 20:59:16 -04:00
Phil Estes
58b715ad8d
Disable arm64 criu testing in GH Actions 
Due to current 100% failure rate on arm64 with the current OS image, disable criu testing for now

Signed-off-by: Phil Estes <estesp@amazon.com>
(cherry picked from commit 9ca6a7ee0aa0ea8added551dd16e00b2102fdea4)
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2025-04-16 16:17:25 -07:00
Akhil Mohan
b4a53e8264
disable portmap test in ubuntu-22 to make CI happy 
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
(cherry picked from commit 338e0a1266302fed4b52a852735b90a832ad2b0f)
(cherry picked from commit 70db1bd00fb5db7c3958da4aefac0c41c89bb654)
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2025-04-16 16:15:12 -07:00
Akhil Mohan
4bcf472de6
add option to skip tests in critest 
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
(cherry picked from commit 4ba3d82ca270937a428d4b6c006bd7e9f8261743)
(cherry picked from commit 8e6c93b6b057230915b449349836bf198f8ebcfe)
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2025-04-16 16:14:51 -07:00
Derek McGowan
ea7be04cb4
Merge pull request #11698 from k8s-infra-cherrypick-robot/cherry-pick-11670-to-release/2.0 
[release/2.0] Prevent panic on zero length push
 2025-04-16 08:57:13 +08:00
Derek McGowan
ebd9a50325
Merge pull request #11688 from estesp/cp-11641 
[release/2.0] backport: Set default differ for the default unpack config of transfer service
 2025-04-16 08:56:47 +08:00
Derek McGowan
ff47757ae4
Merge pull request #11703 from k8s-infra-cherrypick-robot/cherry-pick-11479-to-release/2.0 
[release/2.0] ci: update GitHub Actions release runner to ubuntu-24.04
 2025-04-16 08:53:11 +08:00
Austin Vazquez
b184a97d30 ci: update GitHub Actions release runner to ubuntu-24.04 
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
 2025-04-16 00:16:49 +00:00
Cesar Talledo
8a638b71ae Prevent panic in Docker pusher. 
Prevent a panic in the Docker pusher pushWriter, by checking that
the pipe is non nil before attempting to use it.

The panic was found by Moby issue #46746 (https://github.com/moby/moby/issues/46746).
With this fix the panic no longer reproduces.

Signed-off-by: Cesar Talledo <cesar.talledo@docker.com>
 2025-04-14 21:25:41 +00:00
Henry Wang
84d9658c36
Set default differ for the default unpack config of transfer service 
Signed-off-by: Henry Wang <henwang@amazon.com>
(cherry picked from commit a083b669c9412eef55ee103fe2bb1dec7c6178bc)
 2025-04-11 12:09:53 -04:00
Fu Wei
9e97c2e626
Merge pull request #11621 from k8s-infra-cherrypick-robot/cherry-pick-11475-to-release/2.0 
[release/2.0] fix: call checkCopyShimLogError(shimCtx) to avoid expected error log flood
 2025-03-28 19:12:21 -04:00
yylt
e04543db09 use shimCtx for fifo copy 
Signed-off-by: yylt <yang8518296@163.com>
 2025-03-28 20:28:58 +00:00
Fu Wei
a5b872b5c8
Merge pull request #11618 from k8s-infra-cherrypick-robot/cherry-pick-11569-to-release/2.0 
[release/2.0] update taskOptions based on runtimeOptions when creating a task
 2025-03-28 15:24:53 -04:00
Iceber Gu
9f46e7a449 integration/client: add tests for TaskOptions is not empty 
Co-authored-by: Wei Fu <fuweid89@gmail.com>
Signed-off-by: Iceber Gu <caiwei95@hotmail.com>
 2025-03-28 18:33:13 +00:00
Iceber Gu
8a16a6a04a prefer task options for PluginInfo request 
Signed-off-by: Iceber Gu <caiwei95@hotmail.com>
 2025-03-28 18:33:13 +00:00
Iceber Gu
a183b2d232 update taskOptions based on runtimeOptions when creating a task 
Signed-off-by: Iceber Gu <caiwei95@hotmail.com>
 2025-03-28 18:33:13 +00:00
Fu Wei
c146996f3f
Merge pull request #11599 from k8s-infra-cherrypick-robot/cherry-pick-11581-to-release/2.0 
[release/2.0] *: CRIImageService should delete image synchronously
 2025-03-25 09:47:53 -04:00
Wei Fu
091143135b *: CRIImageService should delete image synchronously 
Use memory service instead of metadata store.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2025-03-25 02:36:45 +00:00
Phil Estes
148fbbb92f
Merge pull request #11583 from k8s-infra-cherrypick-robot/cherry-pick-11560-to-release/2.0 
[release/2.0] Update runc binary to v1.2.6
 2025-03-24 16:16:45 +01:00
Austin Vazquez
c2372c072c Update runc binary to v1.2.6 
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
 2025-03-22 18:53:57 +00:00
Akihiro Suda
ceb33770d2
Merge pull request #11566 from klihub/2.0/deps/bump-cdi-version 
[release/2.0] go.{mod,sum}: bump CDI deps to stable v1.0.0.
 2025-03-20 02:57:31 +09:00
Phil Estes
c0d93d20be
Merge pull request #11571 from AkihiroSuda/dev-2.0 
[release/2.0] silence govulncheck false positives
 2025-03-19 17:58:09 +01:00
Krisztian Litkey
e8506511b2
go.{mod,sum}: bump CDI deps to stable v1.0.0. 
Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>
 2025-03-19 17:29:35 +02:00
Akihiro Suda
4cfb89430c
go.mod: github.com/go-jose/go-jose/v4 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2025-03-19 23:00:47 +09:00
Akihiro Suda
2b9e6a29d7
go.mod: golang.org/x/oauth2 v0.28.0 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2025-03-19 23:00:20 +09:00
Akihiro Suda
6df1ea0d9e
go.mod: golang.org/x/net v0.37.0 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2025-03-19 22:59:07 +09:00
Akihiro Suda
dcd661b138
Merge pull request #11567 from klihub/fixes/2.0/ci-lint-errors 
[release/2.0] Fix CI lint error (cherry-picked #11555)
 2025-03-19 22:49:23 +09:00
Jin Dong
16f20abdff
Fix CI lint error 
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
(cherry picked from commit c8effff1a823bed757194584a80a043c3a69da1a)
 2025-03-19 11:35:45 +02:00
Derek McGowan
1a43cb6a10
Merge commit from fork 
[release 2.0] validate uid/gid
 2025-03-18 01:23:21 +08:00
Derek McGowan
bf82ae2582
Merge pull request #11541 from dmcgowan/prepare-2.0.4 
[release/2.0] Prepare release notes for v2.0.4
 2025-03-18 01:21:27 +08:00
Derek McGowan
06a886a8e4
Prepare release notes for v2.0.4 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2025-03-13 18:47:26 -07:00
Akihiro Suda
e9989a2147
Merge pull request #11536 from k8s-infra-cherrypick-robot/cherry-pick-11508-to-release/2.0 
[release/2.0] Respect `client.WithTimeout` option on connect
 2025-03-14 09:30:39 +09:00
Akihiro Suda
b6ab437d2b
Merge pull request #11537 from k8s-infra-cherrypick-robot/cherry-pick-11327-to-release/2.0 
[release/2.0] Update image type checks to avoid unnecessary logs for attestations
 2025-03-14 09:07:49 +09:00
Paweł Gronowski
916d487226 core/remotes: Handle attestations in MakeRefKey 
Don't produce `reference for unknown type: application/vnd.in-toto+json`
warning logs when pushing/fetching an image containing the attestation
manifests.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
 2025-03-13 18:18:21 +00:00
Paweł Gronowski
df4d905a6f core/images: Ignore attestations when traversing children 
Before this patch, calling `image.Children` on an image built with
BuildKit would produce unnecessary `encountered unknown type
application/vnd.in-toto+json; children may not be fetched` debug logs,
because the media type is neither a known layer or config type.

Make the `image.Children` aware of the attestation layers and don't
attempt to traverse them.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
 2025-03-13 18:18:21 +00:00
Paweł Gronowski
6b5efba83b client: Respect client.WithTimeout option 
Fix the gRPC client dialer not using the timeout passed by the
containerd client timeout option.

Commit 63b4688175 replaced the usage of deprecated `grpc.DialContext`
with `grpc.NewClient`.

However, the `dialer.ContextDialer` relied on the context deadline to
propagate the timeout:

388fb336b0/vendor/google.golang.org/grpc/clientconn.go (L216)

This assumption is now broken, because `grpc.NewClient` doesn't do any
initial connection and defers it to the first RPC usage.

This commit passes the timeout via the `MinConnectTimeout` grpc
connection param, which will be applied to **every** connection attempt
(not just the first).

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
 2025-03-13 18:11:16 +00:00
Derek McGowan
76db0585af
Merge pull request #11529 from ningmingxiao/v2.0_fix 
[release/2.0] Fix incorrect runtime name being passed to NRI
 2025-03-13 23:58:57 +08:00
Craig Ingram
07a0b5419c (cherry picked from commit de1341c201ffb0effebbf51d00376181968c8779) 2025-03-11 14:52:44 +00:00
ningmingxiao
4f037050ce add name in package version 
Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn>
 2025-03-11 09:31:53 +08:00
Akihiro Suda
5a3ac90a7a
Merge pull request #11514 from akhilerm/2.0-update-go1.24.1 
[release/2.0] update build to go1.23.7, test go1.24.1
 2025-03-10 04:20:40 +09:00
Akhil Mohan
e5ad0d0a0e
update build to go1.23.7, test go1.24.1 
- go1.23.7 (released 2025-03-04) includes security fixes to the net/http
package, as well as bug fixes to cgo, the compiler, and the reflect,
runtime, and syscall packages. See the Go 1.23.7 milestone on our issue
tracker for details

- go1.24.1 (released 2025-03-04) includes security fixes to the net/http
package, as well as bug fixes to cgo, the compiler, the go command, and
the reflect, runtime, and syscall packages. See the Go 1.24.1 milestone
on our issue tracker for details.

Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
 2025-03-09 19:06:40 +05:30
Phil Estes
ad6934d599
Merge pull request #11506 from k8s-infra-cherrypick-robot/cherry-pick-11502-to-release/2.0 
[release/2.0] docs: include note about unprivileged sysctls
 2025-03-07 16:34:33 -05:00
Phil Estes
62f18de18b
Merge pull request #11503 from k8s-infra-cherrypick-robot/cherry-pick-11489-to-release/2.0 
[release/2.0] e2e: use the shim bundled with containerd artifact
 2025-03-07 16:05:43 -05:00
Samuel Karp
a39f1146b0 docs: include note about unprivileged sysctls 
We changed the default setting for `enable_unprivileged_ports` and
`enable_unprivileged_icmp` in the CRI plugin in
https://github.com/containerd/containerd/pull/9348, but missed including
this change in the release notes.

Signed-off-by: Samuel Karp <samuelkarp@google.com>
 2025-03-07 08:34:08 +00:00
Akhil Mohan
81b3384a0d e2e: use the shim bundled with containerd artifact 
use the shim bundled with cri-cni-containerd tar rather than using
the shim present on the host machine for running e2e

Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
 2025-03-07 02:26:35 +00:00
Samuel Karp
a7f1ff94d7
Merge pull request #11497 from akhilerm/update-ltag-2.0 
[release/2.0] build(deps): bump containerd/project-checks from 1.1.0 to 1.2.1
 2025-03-06 10:29:25 -08:00
dependabot[bot]
7215a7d2ca
build(deps): bump containerd/project-checks from 1.1.0 to 1.2.1 
Bumps [containerd/project-checks](https://github.com/containerd/project-checks) from 1.1.0 to 1.2.1.
- [Commits](434a071576...800740a80e)

---
updated-dependencies:
- dependency-name: containerd/project-checks
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 69c0d7f60f74210d6e41515e9064bb96362683c7)
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
 2025-03-06 14:43:05 +05:30
Derek McGowan
06b99ca80c
Merge pull request #11443 from dmcgowan/prepare-v2.0.3 
[release/2.0] Prepare release notes for v2.0.3
 2025-02-28 10:54:00 -08:00
Derek McGowan
84e6cbafd5
Merge pull request #11457 from jsternberg/backport-remote-write-grpc-limits-exceeded 
[release/2.0] Update remote content to break up writes to avoid grpc message size limits
 2025-02-28 10:51:56 -08:00