Commit Graph

14560 Commits

Author SHA1 Message Date
Akihiro Suda
cdaf4dfb4d
Prepare release notes for v2.0.2
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2025-01-14 11:14:20 +09:00
Kazuyoshi Kato
0d9aa65eba
Merge pull request #11259 from k8s-infra-cherrypick-robot/cherry-pick-11257-to-release/2.0
[release/2.0] Update platforms to latest rc
2025-01-13 16:00:04 -08:00
Derek McGowan
eb125e1dd3 Update platforms to latest rc
Signed-off-by: Derek McGowan <derek@mcg.dev>
2025-01-13 22:26:42 +00:00
Derek McGowan
c334ae68b8
Merge pull request #11256 from k8s-infra-cherrypick-robot/cherry-pick-10980-to-release/2.0
[release/2.0] Remove confusing warning in cri runtime config migration
2025-01-13 09:09:32 -07:00
Jin Dong
468079c5c4 Remove confusing warning in cri runtime config migration
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
2025-01-13 15:26:45 +00:00
Akihiro Suda
b48e1080c2
Merge pull request #11248 from k8s-infra-cherrypick-robot/cherry-pick-11165-to-release/2.0
[release/2.0] Fix runtime platform loading in cri image plugin init
2025-01-11 23:06:22 +09:00
Jin Dong
a2d9d4fd55 Fix runtime platform loading in cri image plugin init
The cri image service init has a bug where, after getting FSPath
for snapshotter_i, it stores it under defaultSnapshotter instead
of snapshotter_i.

Also make a few other refactor:

1. Dedup the snapshotRoot loading for defaultSnapshotter
2. Remove some unnecessary logic in RuntimePlatforms for-loop

Signed-off-by: Jin Dong <djdongjin95@gmail.com>
2025-01-10 21:12:46 +00:00
Maksym Pavlenko
e1b0bb601e
Merge pull request #11246 from k8s-infra-cherrypick-robot/cherry-pick-11161-to-release/2.0
[release/2.0] make sure console master tty is closed on task exit
2025-01-10 12:36:24 -08:00
Henry Wang
184ffad01f Add integ test to check tty leak
Signed-off-by: Henry Wang <henwang@amazon.com>
2025-01-10 16:38:20 +00:00
Henry Wang
17181ed33e fix master tty leak due to leaking init container object
Signed-off-by: Henry Wang <henwang@amazon.com>
2025-01-10 16:38:20 +00:00
Derek McGowan
1698a59589
Merge pull request #11242 from djdongjin/bump-otelttrpc-release-20
[release/2.0] Bump up otelttrpc to 0.1.0
2025-01-09 22:53:00 -07:00
Jin Dong
8666e74225 Bump up otelttrpc to 0.1.0
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
2025-01-09 22:41:30 +00:00
Phil Estes
6f98bd9ed7
Merge pull request #11236 from k8s-infra-cherrypick-robot/cherry-pick-11229-to-release/2.0
[release/2.0] ctr: `ctr images import --all-platforms`: fix unpack
2025-01-09 11:51:40 -05:00
Samuel Karp
584ec48405
Merge pull request #11239 from k8s-infra-cherrypick-robot/cherry-pick-11230-to-release/2.0
[release/2.0] update runc binary to v1.2.4
2025-01-08 22:47:53 -08:00
Akhil Mohan
7373ddd70b update runc binary to v1.2.4
This is the fourth patch release of the 1.2.z release branch of runc. It
includes a fix for a regression introduced in 1.2.0 related to the
default device list.

- Re-add tun/tap devices to built-in allowed devices lists.

  In runc 1.2.0 we removed these devices from the default allow-list
(which were added seemingly by accident early in Docker's history) as
a precaution in order to try to reduce the attack surface of device
inodes available to most containers. At the time we thought
that the vast majority of users using tun/tap would already be
specifying what devices they need (such as by using --device with
Docker/Podman) as opposed to doing the mknod manually, and thus
there would've been no user-visible change.

  Unfortunately, it seems that this regressed a noticeable number of
users (and not all higher-level tools provide easy ways to specify
devices to allow) and so this change needed to be reverted. Users
that do not need these devices are recommended to explicitly disable
them by adding deny rules in their container configuration.

diff: https://github.com/opencontainers/runc/compare/v1.2.3...v1.2.4

Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
2025-01-09 02:44:11 +00:00
Akihiro Suda
c4270430db ctr: ctr images import --all-platforms: fix unpack
Fix issue 11228

`ctr images import --all-platforms` w/o `--local` was failing due to
`unable to initialize unpacker: no unpack platforms defined` error.

W/ `--local`, it unpacks the layers for the strict-default platform.

Now `ctr images import --all-platforms` w/o `--local` unpacks the layers
for the non-strict default platform.
This behavior still differs from `--local`.
i.e., on an arm64 host, arm/v{5,6,7} layers are unpacked too.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2025-01-09 02:26:18 +00:00
Phil Estes
ce560bb249
Merge pull request #11222 from k8s-infra-cherrypick-robot/cherry-pick-11220-to-release/2.0
[release/2.0] downgrade go-difflib and go-spew to tagged releases
2025-01-06 11:27:53 -05:00
Akihiro Suda
0d91d8e5e5
Merge pull request #11213 from pgimalac/pgimalac/containerd-no-plugin-v2.0
[release/2.0] Add a build tag to disable std `plugin` import
2025-01-06 21:44:10 +09:00
Sebastiaan van Stijn
f34147772b downgrade go-difflib and go-spew to tagged releases
These dependencies were updated to "master" in some modules we depend on,
but have no code-changes since their last release. Unfortunately, this also
causes a ripple effect, forcing all users of the containerd module to also
update these dependencies to an unrelease / un-tagged version.

Both these dependencies will unlikely do a new release in the near future,
so exclude these versions so that we can downgrade to the current release.

For additional details, see [this PR][1] and links mentioned in it.

[1]: https://github.com/kubernetes-sigs/kustomize/pull/5830#issuecomment-2569960859

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-01-06 08:35:14 +00:00
Pierre Gimalac
dca769485c
chore: add a build tag to disable containerd plugin import
Signed-off-by: Pierre Gimalac <pierre.gimalac@datadoghq.com>
2024-12-31 13:39:34 +01:00
Samuel Karp
fb61c901db
Merge pull request #11187 from k8s-infra-cherrypick-robot/cherry-pick-11185-to-release/2.0
[release/2.0] Update golangci to 1.60.3
2024-12-20 13:51:17 -08:00
Derek McGowan
5942b3fcba Update golangci to 1.60.3
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-12-20 19:27:06 +00:00
Derek McGowan
88aa2f531d
Merge pull request #11158 from dmcgowan/prepare-v2.0.1
[release/2.0] Prepare release notes for v2.0.1
2024-12-13 15:36:28 -08:00
Derek McGowan
b0ece5dc55
Prepare release notes for v2.0.1
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-12-13 13:54:03 -08:00
Maksym Pavlenko
e206c07edc
Merge pull request #11154 from k8s-infra-cherrypick-robot/cherry-pick-11122-to-release/2.0
[release/2.0] build(deps): bump actions/attest-build-provenance from 1.4.4 to 2.1.0
2024-12-13 11:41:59 -08:00
dependabot[bot]
fe69570849
build(deps): bump actions/attest-build-provenance from 1.4.4 to 2.1.0
Bumps [actions/attest-build-provenance](https://github.com/actions/attest-build-provenance) from 1.4.4 to 2.1.0.
- [Release notes](https://github.com/actions/attest-build-provenance/releases)
- [Changelog](https://github.com/actions/attest-build-provenance/blob/main/RELEASE.md)
- [Commits](ef244123eb...7668571508)

Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-12-13 10:09:20 -08:00
Derek McGowan
eb2d0c4762
Merge pull request #11153 from k8s-infra-cherrypick-robot/cherry-pick-11130-to-release/2.0
[release/2.0] update xx to v1.6.1 for compatibility with alpine 3.21 and file 5.46+
2024-12-13 09:58:31 -08:00
Sebastiaan van Stijn
eb2ce68829 update xx to v1.6.1 for compatibility with alpine 3.21 and file 5.46+
This fixes compatibility with alpine 3.21 and file 5.46+

- Fix additional possible `xx-cc`/`xx-cargo` compatibility issue with Alpine 3.21
- Support for Alpine 3.21
- Fix `xx-verify` with `file` 5.46+
- Fix possible error taking lock in `xx-apk` in latest Alpine without `coreutils`

full diff: https://github.com/tonistiigi/xx/compare/v1.2.1...v1.6.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-12-12 19:12:49 +00:00
Derek McGowan
c11f124500
Merge pull request #11139 from k8s-infra-cherrypick-robot/cherry-pick-11086-to-release/2.0
[release/2.0] ctr pull should unpack for default platform when transfer service is used
2024-12-12 11:05:34 -08:00
Derek McGowan
8c6dd50d91
Merge pull request #11151 from k8s-infra-cherrypick-robot/cherry-pick-11104-to-release/2.0
[release/2.0] internal/cri: should not apply IoOwner options if it's not user namespace
2024-12-12 11:05:10 -08:00
Phil Estes
e9004f0a88
Merge pull request #11146 from k8s-infra-cherrypick-robot/cherry-pick-11135-to-release/2.0
[release/2.0] Update go-cni for CNI STATUS
2024-12-12 10:12:54 -05:00
Phil Estes
c403b64231
Merge pull request #11140 from k8s-infra-cherrypick-robot/cherry-pick-11061-to-release/2.0
[release/2.0] Fix cri grpc plugin config migration
2024-12-12 10:12:27 -05:00
Phil Estes
d5a99f073f
Merge pull request #11142 from thaJeztah/2.0_backport_bump_runc_binary
[release/2.0 backport] update runc binary to v1.2.3
2024-12-12 10:11:53 -05:00
Wei Fu
018d83650f internal/cri: should not apply IoOwner options
When kubelet enables UserNamespaceSupport feature gate, kubelet always
uses non-empty UsernsOptions to setup pods. In this case, the gVisor shim is
unable to parse runc.Option so that it will be unable to start container.

This change is to avoid adding IoOwner options if the UsernsOptions is
for node level. Since gVisor hasn't feature subcommand yet, CRI status
will report that gVisor runtime doesn't support user namespace. So it's
kind of workaround to avoid compatible issue.

REF: #11091

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2024-12-12 14:49:29 +00:00
Michael Zappa
5eb7995a9a feat: update go-cni version for CNI STATUS
Signed-off-by: Michael Zappa <michael.zappa@gmail.com>
2024-12-11 20:50:33 +00:00
Sebastiaan van Stijn
a53eff53d9
update runc binary to v1.2.3
This is the third patch release of the 1.2.z release branch of runc. It
primarily fixes some minor regressions introduced in 1.2.0.

- Fixed a regression in use of securejoin.MkdirAll, where multiple
  runc processes racing to create the same mountpoint in a shared rootfs
  would result in spurious EEXIST errors. In particular, this regression
  caused issues with BuildKit.
- Fixed a regression in eBPF support for pre-5.6 kernels after upgrading
  Cilium's eBPF library version to 0.16 in runc.

full diff: https://github.com/opencontainers/runc/compare/v1.2.2...v1.2.3
release notes: https://github.com/opencontainers/runc/releases/tag/v1.2.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 981414521baf578a313c7b7af034ade6cb92b10d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-12-11 21:31:32 +01:00
Derek McGowan
a2302ea89f Add integration test for custom configuration
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-12-11 16:50:42 +00:00
Jin Dong
be5eda069f complete cri grpc config migration
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
2024-12-11 16:50:42 +00:00
Jin Dong
44cdca68b5 ctr pull unpack for default platform using transfer service
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
2024-12-11 16:50:34 +00:00
Samuel Karp
d93ae6232a
Merge pull request #11068 from k8s-infra-cherrypick-robot/cherry-pick-11062-to-release/2.0
[release/2.0] Update differ to handle zstd media types
2024-12-09 15:22:26 -08:00
Derek McGowan
154b692b2b
Merge pull request #11109 from k8s-infra-cherrypick-robot/cherry-pick-11102-to-release/2.0
[release/2.0] update to go1.23.4 / go1.22.10
2024-12-06 06:07:41 -08:00
Akihiro Suda
ed0b75c52b
Merge pull request #11110 from k8s-infra-cherrypick-robot/cherry-pick-10930-to-release/2.0
[release/2.0] CI: update Fedora to 41
2024-12-06 23:05:55 +09:00
Akihiro Suda
62b790bfac CI: update Fedora to 41
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2024-12-06 03:17:32 +00:00
Akhil Mohan
290e8bc704 update to go1.23.4 / go1.22.10
- go1.23.4 (released 2024-12-03) includes fixes to the compiler, the runtime,
the trace command, and the syscall package. See the Go 1.23.4 milestone on
our issue tracker for details.
https://github.com/golang/go/issues?q=milestone%3AGo1.23.4+label%3ACherryPickApproved

- go1.22.10 (released 2024-12-03) includes fixes to the runtime and the
syscall package. See the Go 1.22.10 milestone on our issue tracker for details.
https://github.com/golang/go/issues?q=milestone%3AGo1.22.10+label%3ACherryPickApproved

Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
2024-12-06 02:48:11 +00:00
Derek McGowan
1b7befc8dd
Merge pull request #11098 from k8s-infra-cherrypick-robot/cherry-pick-11069-to-release/2.0
[release/2.0] Fix panic due to nil dereference cgroups v2
2024-12-05 16:24:36 -08:00
Jin Dong
3ba2df924a fix panic due to nil dereference cgroups v2
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
2024-12-05 01:53:43 +00:00
Derek McGowan
961cac9aa0
Merge pull request #11067 from austinvazquez/cherry-pick-3961dc9c8cb0e31925e45a2273bbdc06412be262-to-2.0
[release/2.0] Publish attestation as release artifact
2024-11-27 08:36:11 -08:00
Derek McGowan
73f57acb0d Update differ to handle zstd media types
The differ should be able to generate zstd compressed layers when
provided with the zstd media type.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-11-27 16:35:58 +00:00
Austin Vazquez
34a45cab2a
Publish attestation as release artifact
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
(cherry picked from commit 3961dc9c8cb0e31925e45a2273bbdc06412be262)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
2024-11-26 19:47:08 -07:00
Derek McGowan
b4cab35e2b
Merge pull request #11053 from djdongjin/rocky-ci-fix-2.0
[release/2.0] Move rockylinux 9.4 to almalinux/9 in CI
2024-11-25 06:11:04 -08:00