kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-01 16:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

cni: respect default cni_config_dir and cni_path (#10870)

Browse Source 
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 3f6ece54d9
commit b397edff4e
2 changed files with 5 additions and 0 deletions
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,