cni: respect default cni_config_dir and cni_path

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.
hashicorp · Jul 8, 2021 · 3b70b36 · 3b70b36
1 parent 60a92ff
commit 3b70b36
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/.changelog/10870.txt 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
@@ -935,6 +935,8 @@ func DefaultConfig() *Config {
 				DisableSandbox:   false,
 			},
 			BindWildcardDefaultHostNetwork: true,
+			CNIPath:                        "/opt/cni/bin",
+			CNIConfigDir:                   "/opt/cni/config",
 		},
 		Server: &ServerConfig{
 			Enabled:           false,