forked from kubernetes/minikube
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Stop using /etc/cni/net.d for podman network
Kubernetes can't handle anything else using the same config directory, and doesn't have a method of choosing which cni.
- Loading branch information
1 parent
386561f
commit c6c9cec
Showing
2 changed files
with
34 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
# The containers configuration file specifies all of the available configuration | ||
# command-line options/flags for container engine tools like Podman & Buildah, | ||
# but in a TOML format that can be easily modified and versioned. | ||
|
||
# Please refer to containers.conf(5) for details of all configuration options. | ||
# Not all container engines implement all of the options. | ||
# All of the options have hard coded defaults and these options will override | ||
# the built in defaults. Users can then override these options via the command | ||
# line. Container engines will read containers.conf files in up to three | ||
# locations in the following order: | ||
# 1. /usr/share/containers/containers.conf | ||
# 2. /etc/containers/containers.conf | ||
# 3. $HOME/.config/containers/containers.conf (Rootless containers ONLY) | ||
# Items specified in the latter containers.conf, if they exist, override the | ||
# previous containers.conf settings, or the default settings. | ||
|
||
[network] | ||
|
||
# Path to directory where CNI plugin binaries are located. | ||
# | ||
# cni_plugin_dirs = ["/usr/libexec/cni"] | ||
|
||
# The network name of the default CNI network to attach pods to. | ||
# default_network = "podman" | ||
|
||
# Path to the directory where CNI configuration files are located. | ||
# | ||
# network_config_dir = "/etc/cni/net.d/" | ||
network_config_dir = "/etc/containers/net.d/" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters