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

AkihiroSuda · AkihiroSuda · commit 0b2b9647992d · 2023-06-03T17:05:43.000+09:00
Cherry-pick of PR 8606 missed the v1.7.2 milestone Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit 69b451a) Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
diff --git a/RELEASES.md b/RELEASES.md
@@ -398,7 +398,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
@@ -156,7 +156,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
@@ -398,7 +398,7 @@ The deprecated properties in [`config.toml`](./docs/cri/config.md) are shown in
`398`	`398`	`> Note`
`399`	`399`	`>`
`400`	`400`	> CNI Config Template (`plugins."io.containerd.grpc.v1.cri".cni.conf_template`) was once deprecated in v1.7.0,
`401`		`-> but its deprecation was cancelled in v1.7.2.`
	`401`	`+> but its deprecation was cancelled in v1.7.3.`
`402`	`402`
`403`	`403`	`<details><summary>Example: runc option <code>SystemdCgroup</code></summary><p>`
`404`	`404`