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

Merge pull request #9744 from klihub/devel/enable-nri-by-default

Browse Source 
Flip NRI on by default.
This commit is contained in:
Fu Wei 2024-02-07 07:55:29 +00:00 committed by GitHub
commit de14037133
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
docs/NRI.md
View File

@ -52,20 +52,21 @@ the TODO list.
The main reason for this split of functionality is to allow The main reason for this split of functionality is to allow
NRI plugins for other types of sandboxes and for other container clients other than just for CRI containers in the "k8s.io" namespace. NRI plugins for other types of sandboxes and for other container clients other than just for CRI containers in the "k8s.io" namespace.
## Enabling NRI Support in Containerd ## Disabling NRI Support in Containerd
Enabling and disabling NRI support in containerd happens by enabling or Enabling and disabling NRI support in containerd happens by enabling or
disabling the common containerd NRI plugin. The plugin, and consequently disabling the common containerd NRI plugin. Starting with containerd 2.0
NRI functionality, is disabled by default. It can be enabled by editing The plugin, and consequently NRI functionality, is enabled by default.
the `[plugins."io.containerd.nri.v1.nri"]` section in the containerd It can be disabled by editing the `[plugins."io.containerd.nri.v1.nri"]`
configuration file, which by default is `/etc/containerd/config.toml`, section in the containerd configuration file, which by default is
and changing `disable = true` to `disable = false`. Once enabled, the `/etc/containerd/config.toml`, and changing `disable = false` to
NRI section should look something like this: `disable = true`. The NRI section to disable NRI functionality should
look something like this:
```toml ```toml
[plugins."io.containerd.nri.v1.nri"] [plugins."io.containerd.nri.v1.nri"]
# Enable NRI support in containerd. # Disable NRI support in containerd.
disable = false disable = true
# Allow connections from externally launched NRI plugins. # Allow connections from externally launched NRI plugins.
disable_connections = false disable_connections = false
# plugin_config_path is the directory to search for plugin-specific configuration. # plugin_config_path is the directory to search for plugin-specific configuration.

4
integration/client/testdata/default-1.7.toml vendored
View File

@ -196,7 +196,9 @@ version = 2
no_prometheus = false no_prometheus = false
[plugins."io.containerd.nri.v1.nri"] [plugins."io.containerd.nri.v1.nri"]
disable = true # Updated in latest
#disable = true
disable = false
disable_connections = false disable_connections = false
plugin_config_path = "/etc/nri/conf.d" plugin_config_path = "/etc/nri/conf.d"
plugin_path = "/opt/nri/plugins" plugin_path = "/opt/nri/plugins"

2
pkg/nri/config.go
View File

@ -42,7 +42,7 @@ type Config struct {
// DefaultConfig returns the default configuration. // DefaultConfig returns the default configuration.
func DefaultConfig() *Config { func DefaultConfig() *Config {
return &Config{ return &Config{
Disable: true, Disable: false,
SocketPath: nri.DefaultSocketPath, SocketPath: nri.DefaultSocketPath,
PluginPath: nri.DefaultPluginPath, PluginPath: nri.DefaultPluginPath,
PluginConfigPath: nri.DefaultPluginConfigPath, PluginConfigPath: nri.DefaultPluginConfigPath,