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

Merge pull request #9363 from 42wim/fixcni 

cni: use correct interface for netStatus
This commit is contained in:
Nick Ethier 2020-11-17 12:03:39 -05:00 committed by GitHub
parent 511c2e9db2 4e37897dd9
commit b84273fd93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/allocrunner/networking_cni.go
View File

@ -112,7 +112,9 @@ func (c *cniNetworkConfigurator) Setup(ctx context.Context, alloc *structs.Alloc
if len(res.Interfaces) > 0 {
iface, name := func(r *cni.CNIResult) (*cni.Config, string) {
for i := range r.Interfaces {
return r.Interfaces[i], i
if r.Interfaces[i].Sandbox != "" {
return r.Interfaces[i], i
}
}
return nil, ""
}(res)