github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #8637 from AkihiroSuda/followup-8606

Browse Source 
RELEASES.md: de-deprecation of CNI conf_template will be v1.7.3
This commit is contained in:
Akihiro Suda 2023-06-06 17:19:41 +09:00 committed by GitHub
commit 1f54e8fb21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASES.md
View File

@ -404,7 +404,7 @@ The deprecated properties in [`config.toml`](./docs/cri/config.md) are shown in
> **Note** > **Note**
> >
> CNI Config Template (`plugins."io.containerd.grpc.v1.cri".cni.conf_template`) was once deprecated in v1.7.0, > 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> <details><summary>Example: runc option <code>SystemdCgroup</code></summary><p>

2
pkg/cri/config/config.go
View File

@ -145,7 +145,7 @@ type CniConfig struct {
// need to fetch the node object through some external process (which has scalability, auth, complexity issues). // 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 // It is currently heavily used in kubernetes-containerd CI testing
// NetworkPluginConfTemplate was once deprecated in containerd v1.7.0, // 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"` NetworkPluginConfTemplate string `toml:"conf_template" json:"confTemplate"`
// IPPreference specifies the strategy to use when selecting the main IP address for a pod. // IPPreference specifies the strategy to use when selecting the main IP address for a pod.
// //