RELEASES.md: de-deprecation of CNI conf_template will be v1.7.3

AkihiroSuda · AkihiroSuda · commit 69b451af5ab7 · 2023-06-03T17:04:14.000+09:00
Cherry-pick of PR 8606 missed the v1.7.2 milestone

Signed-off-by: Akihiro Suda &lt;akihiro.suda.cz@hco.ntt.co.jp&gt;
diff --git 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.
 
 <details><summary>Example: runc option <code>SystemdCgroup</code></summary><p>
 
diff --git 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.
 	//

Original file line number	Diff line number	Diff line change
@@ -404,7 +404,7 @@ The deprecated properties in [`config.toml`](./docs/cri/config.md) are shown in
`404`	`404`	`> Note`
`405`	`405`	`>`
`406`	`406`	> CNI Config Template (`plugins."io.containerd.grpc.v1.cri".cni.conf_template`) was once deprecated in v1.7.0,
`407`		`-> but its deprecation was cancelled in v1.7.2.`
	`407`	`+> but its deprecation was cancelled in v1.7.3.`
`408`	`408`
`409`	`409`	`<details><summary>Example: runc option <code>SystemdCgroup</code></summary><p>`
`410`	`410`