From fe24b918f6d64bbf1832ef2a2f7c6d55b28b7a20 Mon Sep 17 00:00:00 2001
From: Krisztian Litkey <krisztian.litkey@intel.com>
Date: Sat, 3 Feb 2024 13:08:07 +0200
Subject: [PATCH] pkg/nri, docs: enable NRI by default.

Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>
---
 docs/NRI.md                                  | 19 ++++++++++---------
 integration/client/testdata/default-1.7.toml |  4 +++-
 pkg/nri/config.go                            |  2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/docs/NRI.md b/docs/NRI.md
index 8b2c23e7e..01c945751 100644
--- a/docs/NRI.md
+++ b/docs/NRI.md
@@ -52,20 +52,21 @@ the TODO list.
 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.
 
-## Enabling NRI Support in Containerd
+## Disabling NRI Support in Containerd
 
 Enabling and disabling NRI support in containerd happens by enabling or
-disabling the common containerd NRI plugin. The plugin, and consequently
-NRI functionality, is disabled by default. It can be enabled by editing
-the `[plugins."io.containerd.nri.v1.nri"]` section in the containerd
-configuration file, which by default is `/etc/containerd/config.toml`,
-and changing `disable = true` to `disable = false`. Once enabled, the
-NRI section should look something like this:
+disabling the common containerd NRI plugin. Starting with containerd 2.0
+The plugin, and consequently NRI functionality, is enabled by default.
+It can be disabled by editing the `[plugins."io.containerd.nri.v1.nri"]`
+section in the containerd configuration file, which by default is
+`/etc/containerd/config.toml`, and changing `disable = false` to
+`disable = true`. The NRI section to disable NRI functionality should
+look something like this:
 
 ```toml
   [plugins."io.containerd.nri.v1.nri"]
-    # Enable NRI support in containerd.
-    disable = false
+    # Disable NRI support in containerd.
+    disable = true
     # Allow connections from externally launched NRI plugins.
     disable_connections = false
     # plugin_config_path is the directory to search for plugin-specific configuration.
diff --git a/integration/client/testdata/default-1.7.toml b/integration/client/testdata/default-1.7.toml
index ede46d9c7..601190299 100644
--- a/integration/client/testdata/default-1.7.toml
+++ b/integration/client/testdata/default-1.7.toml
@@ -196,7 +196,9 @@ version = 2
     no_prometheus = false
 
   [plugins."io.containerd.nri.v1.nri"]
-    disable = true
+    # Updated in latest
+    #disable = true
+    disable = false
     disable_connections = false
     plugin_config_path = "/etc/nri/conf.d"
     plugin_path = "/opt/nri/plugins"
diff --git a/pkg/nri/config.go b/pkg/nri/config.go
index d03180c81..1668c9b2e 100644
--- a/pkg/nri/config.go
+++ b/pkg/nri/config.go
@@ -42,7 +42,7 @@ type Config struct {
 // DefaultConfig returns the default configuration.
 func DefaultConfig() *Config {
 	return &Config{
-		Disable:          true,
+		Disable:          false,
 		SocketPath:       nri.DefaultSocketPath,
 		PluginPath:       nri.DefaultPluginPath,
 		PluginConfigPath: nri.DefaultPluginConfigPath,