Skip to content

Commit 034c808

Browse files
authored
Merge pull request #219 from containerd/dep-updates
Automated RELEASES.md sync update
2 parents 5bc2842 + 2445d81 commit 034c808

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

content/releases.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@ of containerd for every supported version of Kubernetes.
146146
| 1.27 | 1.7.0+, 1.6.15+ | v1 |
147147
| 1.28 | 1.7.0+, 1.6.15+ | v1 |
148148
| 1.29 | 1.7.11+, 1.6.27+ | v1 |
149-
| 1.30(wip) | 2.0(wip), 1.7.13+, 1.6.28+ | v1 |
149+
| 1.30 | 2.0(wip), 1.7.13+, 1.6.28+ | v1 |
150+
| 1.31 | 2.0(wip), 1.7.20+, 1.6.34+ | v1 |
150151

151152
** Note: containerd v1.6.*, and v1.7.* support CRI v1 and v1alpha2 through EOL as those releases continue to support older versions of k8s, cloud providers, and other clients using CRI v1alpha2. CRI v1alpha2 is deprecated in v1.7 and will be removed in containerd v2.0.
152153

@@ -463,6 +464,7 @@ The deprecated properties in [`config.toml`](./docs/cri/config.md) are shown in
463464
|`[plugins."io.containerd.grpc.v1.cri".containerd]` | `default_runtime` | containerd v1.3 | containerd v2.0 ✅ | Use `default_runtime_name` |
464465
|`[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.*]` | `runtime_engine` | containerd v1.3 | containerd v2.0 ✅ | Use runtime v2 |
465466
|`[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.*]` | `runtime_root` | containerd v1.3 | containerd v2.0 ✅ | Use `options.Root` |
467+
|`[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.*]` | `disable_cgroup` | - | containerd v2.0 ✅ | Use [cgroup v2 delegation](https://rootlesscontaine.rs/getting-started/common/cgroup2/) |
466468
|`[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.*.options]` | `CriuPath` | containerd v1.7 | containerd v2.0 ✅ | Set `$PATH` to the `criu` binary |
467469
|`[plugins."io.containerd.grpc.v1.cri".registry]` | `auths` | containerd v1.3 | containerd v2.1 | Use [`ImagePullSecrets`](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/). See also [#8228](https://github.com/containerd/containerd/issues/8228). |
468470
|`[plugins."io.containerd.grpc.v1.cri".registry]` | `configs` | containerd v1.5 | containerd v2.1 | Use [`config_path`](./docs/hosts.md) |

0 commit comments

Comments
 (0)