From 69b451af5ab746b3235c5eee2b5f2b10bb9b7734 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sat, 3 Jun 2023 17:04:12 +0900 Subject: [PATCH] RELEASES.md: de-deprecation of CNI conf_template will be v1.7.3 Cherry-pick of PR 8606 missed the v1.7.2 milestone Signed-off-by: Akihiro Suda --- RELEASES.md | 2 +- pkg/cri/config/config.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASES.md b/RELEASES.md index c6b379ee3..4c825f25a 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -404,7 +404,7 @@ The deprecated properties in [`config.toml`](./docs/cri/config.md) are shown in > **Note** > > CNI Config Template (`plugins."io.containerd.grpc.v1.cri".cni.conf_template`) was once deprecated in v1.7.0, -> but its deprecation was cancelled in v1.7.2. +> but its deprecation was cancelled in v1.7.3.
Example: runc option SystemdCgroup

diff --git a/pkg/cri/config/config.go b/pkg/cri/config/config.go index 5487f8b28..3966e549a 100644 --- a/pkg/cri/config/config.go +++ b/pkg/cri/config/config.go @@ -145,7 +145,7 @@ type CniConfig struct { // need to fetch the node object through some external process (which has scalability, auth, complexity issues). // It is currently heavily used in kubernetes-containerd CI testing // NetworkPluginConfTemplate was once deprecated in containerd v1.7.0, - // but its deprecation was cancelled in v1.7.2. + // but its deprecation was cancelled in v1.7.3. NetworkPluginConfTemplate string `toml:"conf_template" json:"confTemplate"` // IPPreference specifies the strategy to use when selecting the main IP address for a pod. //