From 8f25a9d7cd8c50ebc59e15bae03beb1d659c98da Mon Sep 17 00:00:00 2001
From: Tim Gross <tgross@hashicorp.com>
Date: Thu, 8 Jul 2021 09:56:57 -0400
Subject: [PATCH] cni: respect default `cni_config_dir` and `cni_path` (#10870)

The default agent configuration values were not set, which meant they were not
being set in the client configuration and this results in fingerprints failing
unless the values were set explicitly.
---
 .changelog/10870.txt    | 3 +++
 command/agent/config.go | 2 ++
 2 files changed, 5 insertions(+)
 create mode 100644 .changelog/10870.txt

diff --git a/.changelog/10870.txt b/.changelog/10870.txt
new file mode 100644
index 000000000..bff2620bb
--- /dev/null
+++ b/.changelog/10870.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+cni: Fixed a bug where fingerprinting of CNI configuration failed with default `cni_config_dir` and `cni_path`
+```
diff --git a/command/agent/config.go b/command/agent/config.go
index 02fdb5588..687b3f037 100644
--- a/command/agent/config.go
+++ b/command/agent/config.go
@@ -935,6 +935,8 @@ func DefaultConfig() *Config {
 				DisableSandbox:   false,
 			},
 			BindWildcardDefaultHostNetwork: true,
+			CNIPath:                        "/opt/cni/bin",
+			CNIConfigDir:                   "/opt/cni/config",
 		},
 		Server: &ServerConfig{
 			Enabled:           false,