Maksym Pavlenko
9a4231dcfc
Merge pull request #9961 from zhanluxianshen/clean-cri-opts
...
Clean cri options and useless parms
2024-03-19 19:45:40 +00:00
Maksym Pavlenko
2986e45d9a
Merge pull request #9966 from AkihiroSuda/postpone-9766
...
CRI: postpone removal of deprecated config properties
2024-03-19 19:45:13 +00:00
Maksym Pavlenko
3c9e0bdac3
Merge pull request #9972 from containerd/dependabot/go_modules/github.com/containernetworking/plugins-1.4.1
...
build(deps): bump github.com/containernetworking/plugins from 1.4.0 to 1.4.1
2024-03-19 19:44:05 +00:00
Derek McGowan
93022d83d1
Merge pull request #9735 from dmcgowan/prepare-v2.0.0-rc.0
...
Prepare release notes for v2.0.0-rc.0
2024-03-18 18:46:11 -07:00
Derek McGowan
0d0850af16
Prepare v2.0.0-rc.0
...
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-03-18 18:38:35 -07:00
Derek McGowan
f5abb63c09
Update mailmap
...
Remove bot mailmap entry since release tool has been updated to ignore names with "[bot]"
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-03-18 18:38:34 -07:00
dependabot[bot]
30813f6463
build(deps): bump github.com/containernetworking/plugins
...
Bumps [github.com/containernetworking/plugins](https://github.com/containernetworking/plugins ) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/containernetworking/plugins/releases )
- [Commits](https://github.com/containernetworking/plugins/compare/v1.4.0...v1.4.1 )
---
updated-dependencies:
- dependency-name: github.com/containernetworking/plugins
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-03-18 23:08:13 +00:00
dependabot[bot]
0fafc0c500
build(deps): bump github.com/checkpoint-restore/go-criu/v7
...
Bumps [github.com/checkpoint-restore/go-criu/v7](https://github.com/checkpoint-restore/go-criu ) from 7.0.0 to 7.1.0.
- [Release notes](https://github.com/checkpoint-restore/go-criu/releases )
- [Commits](https://github.com/checkpoint-restore/go-criu/compare/v7.0.0...v7.1.0 )
---
updated-dependencies:
- dependency-name: github.com/checkpoint-restore/go-criu/v7
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-03-18 23:08:01 +00:00
Derek McGowan
d3a77cbb2c
Merge pull request #9967 from thaJeztah/bump_protobuf
...
vendor: github.com/golang/protobuf v1.5.4
2024-03-18 20:44:21 +00:00
Derek McGowan
7c1fca096d
Update migration script based on usage
...
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-03-18 12:14:44 -07:00
Sebastiaan van Stijn
45e425ccce
vendor: github.com/golang/protobuf v1.5.4
...
commit 10c7f03b3b
updated google.golang.org/protobuf
to v1.33.0, which addresses CVE-2024-24786, however a follow-up post on the
Golang security list issued a warning that the v1.33.0 update introduced a
breaking change, causing compatibility with github.com/golang/protobuf to be
broken;
> A small correction: This vulnerability applies when the UnmarshalOptions.DiscardUnknown
> option is set (as well as when unmarshaling into any message which contains a
> google.protobuf.Any). There is no UnmarshalUnknown option.
>
> In addition, version 1.33.0 of google.golang.org/protobuf inadvertently
> introduced an incompatibility with the older github.com/golang/protobuf
> module. (https://github.com/golang/protobuf/issues/1596 ) Users of the older
> module should update to github.com/golang/protobuf@v1.5.4.
Containerd itself does not appear to be using this code, but consumers may be,
so update the github.com/golang/protobuf to restore compatibility.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-03-18 13:44:06 +01:00
Akihiro Suda
4aa6fedd55
CRI: postpone removal of deprecated config properties
...
Postpone PR 9766 until containerd v2.1 at least.
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2024-03-17 15:14:13 +09:00
Edgar Lee
34c545824f
Automatically decompress archives for transfer service import
...
Signed-off-by: Edgar Lee <edgarhinshunlee@gmail.com>
2024-03-15 10:14:19 +08:00
zhanluxianshen
df26c189af
Clean cri options and useless parms
...
Signed-off-by: zhanluxianshen <zhanluxianshen@163.com>
2024-03-14 01:53:33 +00:00
Derek McGowan
c03290cb00
Merge pull request #9962 from dmcgowan/fix-podsandbox-exit-filter
...
Fix invalid event filter in podsandbox
2024-03-13 16:14:14 +00:00
Fu Wei
90ec00c80c
Merge pull request #9963 from dmcgowan/gha-on-fork
...
Update github actions ci to run on forks
2024-03-13 08:29:54 +00:00
Derek McGowan
88421068f7
Fix invalid event filter in podsandbox
...
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-03-12 18:52:44 -07:00
Derek McGowan
357c59b799
Update github actions ci to run on forks
...
Excludes actuated when on fork.
Runs some project tests on fork.
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-03-12 18:20:02 -07:00
Derek McGowan
f8fbdfdd6f
Merge pull request #9956 from containerd/dependabot/github_actions/softprops/action-gh-release-2
...
build(deps): bump softprops/action-gh-release from 1 to 2
2024-03-12 20:13:24 +00:00
Derek McGowan
2baa309a5f
Merge pull request #9959 from containerd/dependabot/go_modules/google.golang.org/grpc-1.62.1
...
build(deps): bump google.golang.org/grpc from 1.62.0 to 1.62.1
2024-03-12 20:09:03 +00:00
Akihiro Suda
5a23e8878c
Merge pull request #9917 from AkihiroSuda/mv-testutil
...
mv internal/testutil pkg/testutil
2024-03-12 12:01:16 +00:00
Adrian Reber
218e2cf7cd
Return correct error if CRIU binary is missing
...
For the first version of containerd's "Forensic Container Checkpointing"
support the error message if the CRIU binary is not found was
deliberately wrong to not break Kubernetes e2e_node tests.
Now that the e2e_node tests have been adapted, containerd can return the
correct error message.
Signed-off-by: Adrian Reber <areber@redhat.com>
2024-03-12 08:29:30 +00:00
dependabot[bot]
4b719cc4b1
build(deps): bump google.golang.org/grpc from 1.62.0 to 1.62.1
...
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go ) from 1.62.0 to 1.62.1.
- [Release notes](https://github.com/grpc/grpc-go/releases )
- [Commits](https://github.com/grpc/grpc-go/compare/v1.62.0...v1.62.1 )
---
updated-dependencies:
- dependency-name: google.golang.org/grpc
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-03-12 06:22:55 +00:00
Derek McGowan
9c77c389d8
Merge pull request #9958 from containerd/dependabot/go_modules/google.golang.org/protobuf-1.33.0
...
build(deps): bump google.golang.org/protobuf from 1.32.0 to 1.33.0
2024-03-12 05:42:35 +00:00
dependabot[bot]
10c7f03b3b
build(deps): bump google.golang.org/protobuf from 1.32.0 to 1.33.0
...
Bumps google.golang.org/protobuf from 1.32.0 to 1.33.0.
---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-03-12 00:02:43 +00:00
dependabot[bot]
21d3fedf44
build(deps): bump softprops/action-gh-release from 1 to 2
...
Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release ) from 1 to 2.
- [Release notes](https://github.com/softprops/action-gh-release/releases )
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md )
- [Commits](https://github.com/softprops/action-gh-release/compare/v1...v2 )
---
updated-dependencies:
- dependency-name: softprops/action-gh-release
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-03-11 23:09:36 +00:00
Akihiro Suda
9fc0b64bc4
Merge pull request #9879 from mikebrow/update-k8s-support-table
...
add k8s 1.29 and 1.30preview to support table
2024-03-09 00:29:08 +00:00
Phil Estes
3134eeb15b
Merge pull request #9930 from zhanluxianshen/clean-typo-plugins
...
Clean typos in plugins.
2024-03-08 20:12:57 +00:00
Phil Estes
3ac92ab772
Merge pull request #9914 from containerd/dependabot/go_modules/otel-a7a861fdf4
...
build(deps): bump the otel group with 8 updates
2024-03-08 17:29:00 +00:00
dependabot[bot]
228aa42a60
build(deps): bump the otel group with 8 updates
...
Bumps the otel group with 8 updates:
| Package | From | To |
| --- | --- | --- |
| [go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc](https://github.com/open-telemetry/opentelemetry-go-contrib ) | `0.48.0` | `0.49.0` |
| [go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp](https://github.com/open-telemetry/opentelemetry-go-contrib ) | `0.48.0` | `0.49.0` |
| [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go ) | `1.23.1` | `1.24.0` |
| [go.opentelemetry.io/otel/exporters/otlp/otlptrace](https://github.com/open-telemetry/opentelemetry-go ) | `1.23.1` | `1.24.0` |
| [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc](https://github.com/open-telemetry/opentelemetry-go ) | `1.23.1` | `1.24.0` |
| [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp](https://github.com/open-telemetry/opentelemetry-go ) | `1.23.1` | `1.24.0` |
| [go.opentelemetry.io/otel/sdk](https://github.com/open-telemetry/opentelemetry-go ) | `1.23.1` | `1.24.0` |
| [go.opentelemetry.io/otel/trace](https://github.com/open-telemetry/opentelemetry-go ) | `1.23.1` | `1.24.0` |
Updates `go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc` from 0.48.0 to 0.49.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases )
- [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md )
- [Commits](https://github.com/open-telemetry/opentelemetry-go-contrib/compare/zpages/v0.48.0...zpages/v0.49.0 )
Updates `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp` from 0.48.0 to 0.49.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases )
- [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md )
- [Commits](https://github.com/open-telemetry/opentelemetry-go-contrib/compare/zpages/v0.48.0...zpages/v0.49.0 )
Updates `go.opentelemetry.io/otel` from 1.23.1 to 1.24.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases )
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md )
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.23.1...v1.24.0 )
Updates `go.opentelemetry.io/otel/exporters/otlp/otlptrace` from 1.23.1 to 1.24.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases )
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md )
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.23.1...v1.24.0 )
Updates `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc` from 1.23.1 to 1.24.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases )
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md )
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.23.1...v1.24.0 )
Updates `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp` from 1.23.1 to 1.24.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases )
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md )
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.23.1...v1.24.0 )
Updates `go.opentelemetry.io/otel/sdk` from 1.23.1 to 1.24.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases )
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md )
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.23.1...v1.24.0 )
Updates `go.opentelemetry.io/otel/trace` from 1.23.1 to 1.24.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases )
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md )
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.23.1...v1.24.0 )
---
updated-dependencies:
- dependency-name: go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: otel
- dependency-name: go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: otel
- dependency-name: go.opentelemetry.io/otel
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: otel
- dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: otel
- dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: otel
- dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: otel
- dependency-name: go.opentelemetry.io/otel/sdk
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: otel
- dependency-name: go.opentelemetry.io/otel/trace
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: otel
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-03-08 15:21:15 +00:00
Phil Estes
1e1fd8fb49
Merge pull request #9926 from mxpv/runtime
...
Move core/runtime/v2/shim to pkg/shim
2024-03-08 15:20:53 +00:00
zhanluxianshen
47d13767f4
Clean typos in plugins.
...
Signed-off-by: zhanluxianshen <zhanluxianshen@163.com>
2024-03-08 07:33:20 +00:00
Phil Estes
249db79d6d
Merge pull request #9923 from containerd/dependabot/github_actions/azure/login-2
...
build(deps): bump azure/login from 1 to 2
2024-03-08 02:54:36 +00:00
Phil Estes
51023872dd
Merge pull request #9946 from austinvazquez/use-go-version-from-matrix
...
Use the Go toolchain in CI matrix to build binaries
2024-03-08 02:52:25 +00:00
Austin Vazquez
7ac9d6909c
Use the Go toolchain in CI matrix to build binaries
...
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
2024-03-08 00:35:36 +00:00
Akihiro Suda
756e22005f
Merge pull request #9916 from containerd/dependabot/go_modules/github.com/stretchr/testify-1.9.0
...
build(deps): bump github.com/stretchr/testify from 1.8.4 to 1.9.0
2024-03-07 23:32:08 +00:00
Phil Estes
3c34e2c87d
Merge pull request #6965 from adrianreber/2022-05-20-checkpoint-cri-rpc
...
Wire through CRI checkpoint RPC
2024-03-07 19:04:33 +00:00
Maksym Pavlenko
6a96e45012
Move shim package to pkg
...
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2024-03-07 10:05:26 -08:00
Adrian Reber
f25770e48d
Wire through CRI ContainerCheckpoint RPC
...
This connects the new CRI ContainerCheckpoint RPC to the existing
internal checkpoint functions. With this commit it is possible
to checkpoint a container in Kubernetes using the Forensic Container
Checkpointing KEP (#2008 ):
# curl X POST "https://localhost:10250/checkpoint/namespace/podId/container "
Which will result in containerd creating a checkpoint in the location
specified by Kubernetes (usually /var/lib/kubelet/checkpoints).
This is a Linux only feature because CRIU only exists on Linux.
Rewritten with the help of Phil Estes.
Signed-off-by: Phil Estes <estesp@gmail.com>
Signed-off-by: Adrian Reber <areber@redhat.com>
2024-03-07 17:34:07 +00:00
Derek McGowan
e53663cca7
Merge pull request #9932 from AkihiroSuda/go-1.21.8
...
update to go 1.21.8, 1.22.1
2024-03-07 05:08:18 +00:00
Fu Wei
1afc6ca3be
Merge pull request #9659 from ambarve/cimfs_unionfs
...
Don't create new scratch VHD per image for CimFS
2024-03-07 04:51:03 +00:00
Akihiro Suda
7ecdebff93
update to go 1.21.8, 1.22.1
...
See https://groups.google.com/g/golang-announce/c/5pwGVUPoMbg
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2024-03-07 08:32:40 +09:00
Derek McGowan
d9a867a076
Merge pull request #9939 from estesp/disable-test-failure-GHA
...
Disable OOM set score unpriv test temporarily
2024-03-06 21:28:18 +00:00
Phil Estes
723306d0ed
Disable OOM set score unpriv test temporarily
...
Temporary skip while we find root cause of GHA environment changes
causing failure.
Signed-off-by: Phil Estes <estesp@amazon.com>
2024-03-06 11:38:53 -05:00
Amit Barve
994fdd74e5
Don't create new scratch VHD per image for CimFS
...
CimFS layers don't need to create a new scratch VHD per image. The scratch VHDs used with CimFS are empty so
we can just create one base VHD and one differencing VHD and copy it for every scratch snapshot.
(Note that UVM VHDs are still unique per image because the VHD information is embedded in the UVM BCD during
import)
Signed-off-by: Amit Barve <ambarve@microsoft.com>
2024-03-06 04:18:17 -08:00
Fu Wei
e814b03c74
Merge pull request #9925 from kiashok/updaetHcsshimTag-0.12.0
...
Update hcsshim to v0.12.0
2024-03-05 08:26:25 +00:00
Fu Wei
de6a094a28
Merge pull request #9598 from abel-von/sandbox-plugin-0103
...
sandbox: add event monitor for podsandbox controller
2024-03-05 08:23:31 +00:00
dependabot[bot]
016b588a98
build(deps): bump github.com/stretchr/testify from 1.8.4 to 1.9.0
...
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify ) from 1.8.4 to 1.9.0.
- [Release notes](https://github.com/stretchr/testify/releases )
- [Commits](https://github.com/stretchr/testify/compare/v1.8.4...v1.9.0 )
---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-03-05 06:15:37 +00:00
Maksym Pavlenko
9b6c1eee6e
Merge pull request #9924 from containerd/dependabot/go_modules/golang-x-ab76824e89
...
build(deps): bump the golang-x group with 2 updates
2024-03-05 05:40:02 +00:00
Maksym Pavlenko
3de575f17c
Merge pull request #9915 from containerd/dependabot/go_modules/github.com/prometheus/client_golang-1.19.0
...
build(deps): bump github.com/prometheus/client_golang from 1.18.0 to 1.19.0
2024-03-05 04:27:56 +00:00