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

Merge pull request #8606 from adisky/remove-conf-template-deprecation

Browse Source 
Remove cni conf_template deprecation
This commit is contained in:
Kazuyoshi Kato
2023-05-31 09:47:21 -07:00
committed by GitHub
parent a81f3fb817 3ca5b4437e
commit 3ad032e9d0
3 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/cri/config.md
View File

@@ -402,9 +402,6 @@ version = 2
# If this is set, containerd will generate a cni config file from the
# template. Otherwise, containerd will wait for the system admin or cni
# daemon to drop the config file into the conf_dir.
# This is a temporary backward-compatible solution for kubenet users
# who don't have a cni daemonset in production yet.
# This will be deprecated when kubenet is deprecated.
# See the "CNI Config Template" section for more details.
conf_template = ""
# ip_pref specifies the strategy to use when selecting the main IP address for a pod.
@@ -503,11 +500,8 @@ runtime will be used. For example, see
## CNI Config Template
Ideally the cni config should be placed by system admin or cni daemon like calico,
weaveworks etc. However, there are still users using [kubenet](https://kubernetes.io/docs/concepts/cluster-administration/network-plugins/#kubenet)
today, who don't have a cni daemonset in production. The cni config template is
a temporary backward-compatible solution for them. This is expected to be
deprecated when kubenet is deprecated.
Ideally the cni config should be placed by system admin or cni daemon like calico, weaveworks etc.
However, this is useful for the cases when there is no cni daemonset to place cni config.
The cni config template uses the [golang
template](https://golang.org/pkg/text/template/) format. Currently supported