Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CNI: add fallback logic if no ip address references sandboxed interface #9895

Merged
merged 4 commits into from
Apr 9, 2021
Merged

CNI: add fallback logic if no ip address references sandboxed interface #9895

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
93e1814
ar: try to find CNI addr if not returned with interface
nickethier Jan 26, 2021
a935ede
ar: only log warning if no addr in found
nickethier Jan 26, 2021
0cc2b29
ar: stringify CNI result debug message
nickethier Apr 5, 2021
6317407
ar: refactor go-cni results processing & add test
schmichael Apr 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 22 additions & 0 deletions client/allocrunner/networking_cni.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package allocrunner

import (
"context"
"encoding/json"
"fmt"
"math/rand"
"os"
Expand Down Expand Up @@ -111,6 +112,11 @@ func (c *cniNetworkConfigurator) Setup(ctx context.Context, alloc *structs.Alloc
break
}

if c.logger.IsDebug() {
resultJSON, _ := json.Marshal(res)
c.logger.Debug("received result from CNI", "result", string(resultJSON))
}

netStatus := new(structs.AllocNetworkStatus)

if len(res.Interfaces) > 0 {
Expand All @@ -134,6 +140,22 @@ func (c *cniNetworkConfigurator) Setup(ctx context.Context, alloc *structs.Alloc
netStatus.Address = iface.IPConfigs[0].IP.String()
}
}

if netStatus.Address == "" {
c.logger.Debug("no address found for sandboxed interface from CNI result, using first available")
var found bool
for _, iface := range res.Interfaces {
if len(iface.IPConfigs) > 0 {
schmichael marked this conversation as resolved.
Show resolved Hide resolved
netStatus.Address = iface.IPConfigs[0].IP.String()
schmichael marked this conversation as resolved.
Show resolved Hide resolved
found = true
break
}
}
if !found {
c.logger.Warn("no address could be found from CNI result", "allocID", alloc.ID)
}
}

if len(res.DNS) > 0 {
netStatus.DNS = &structs.DNSConfig{
Servers: res.DNS[0].Nameservers,
Expand Down