luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

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.
This commit is contained in:
Tim Gross 2021-07-08 09:56:57 -04:00 committed by GitHub
parent 9f128a28ae
commit 8f25a9d7cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/10870.txt Normal file
View File

@ -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`
```

2
command/agent/config.go
View File

@ -935,6 +935,8 @@ func DefaultConfig() *Config {
DisableSandbox: false, DisableSandbox: false,
}, },
BindWildcardDefaultHostNetwork: true, BindWildcardDefaultHostNetwork: true,
CNIPath: "/opt/cni/bin",
CNIConfigDir: "/opt/cni/config",
}, },
Server: &ServerConfig{ Server: &ServerConfig{
Enabled: false, Enabled: false,