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

adds optional loopbackDSR argument to cni conf #60

Merged
merged 2 commits into from
May 10, 2021
Merged

adds optional loopbackDSR argument to cni conf #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ce93fb
adds optional loopbackDSR argument to cni conf
DavidSchott Feb 25, 2021
b9911ee
vendor changes for hcsshim version bump
DavidSchott Mar 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
73 changes: 40 additions & 33 deletions cni/cni.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ type OptionalFlags struct {
AllowAclPortMapping bool `json:"allowAclPortMapping"`
ForceBridgeGateway bool `json:"forceBridgeGateway"` // Intended to be temporary workaround
EnableDualStack bool `json:"enableDualStack"`
LoopbackDSR bool `json:"loopbackDSR"`
}

func (r *Result) Print() {
Expand Down Expand Up @@ -192,7 +193,13 @@ func (config *NetworkConfig) Serialize() []byte {
}

// GetNetworkInfo from the NetworkConfig
func (config *NetworkConfig) GetNetworkInfo(podNamespace string) *network.NetworkInfo {
func (config *NetworkConfig) GetNetworkInfo(podNamespace string) (ninfo *network.NetworkInfo, err error) {
if config.OptionalFlags.LoopbackDSR {
if err := hcn.DSRSupported(); err != nil {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(I am not well versed in golang, so bear with me) Why is err := hcn.DSRSupported(); included in the if condition? does this if condition basically come down to err != nil and have you tested that?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I actually encountered this condition on RS5 by using older hcsshim version that did not include microsoft/hcsshim#848 (it was using the old DSR version check, hence it failed on RS5).

This inline assignment and error check in the If statement is a common idiom in Golang, e.g. see: https://golang.org/doc/effective_go#if

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

awesome, thanks David! maybe I will use this in the future :)

logrus.Errorf("[cni-net] Failed to enable loopbackDSR on unsupported HCN version, err:%v.", err)
return nil, err
}
}
var subnets []network.SubnetInfo
// Note the code below is looking inside the ipam specific configuration.
if config.Ipam.Subnet != "" {
Expand Down Expand Up @@ -234,7 +241,7 @@ func (config *NetworkConfig) GetNetworkInfo(podNamespace string) *network.Networ
dnsSettings.Options = config.RuntimeConfig.DNS.Options
}

ninfo := &network.NetworkInfo{
ninfo = &network.NetworkInfo{
ID: config.Name,
Name: config.Name,
Type: network.NetworkType(config.Name),
Expand All @@ -251,7 +258,7 @@ func (config *NetworkConfig) GetNetworkInfo(podNamespace string) *network.Networ
}
}

return ninfo
daschott marked this conversation as resolved.
Show resolved Hide resolved
return ninfo, err
}

// getInACLRule generates an In ACLs for mapped ports
Expand Down Expand Up @@ -364,14 +371,14 @@ func GetCurrResult(network *network.NetworkInfo, endpoint *network.EndpointInfo,

var ip = GetIP(network, endpoint)
ip.InterfaceIndex = 0

cIP := cniTypesCurr.IPConfig{
Version: ip.Version,
Address: net.IPNet{
IP: ip.Address.IP,
Mask: ip.Address.Mask},
Gateway: ip.Gateway,
Interface: &ip.InterfaceIndex,
Version: ip.Version,
Address: net.IPNet{
IP: ip.Address.IP,
Mask: ip.Address.Mask},
Gateway: ip.Gateway,
Interface: &ip.InterfaceIndex,
}

result.IPs = append(result.IPs, &cIP)
Expand All @@ -383,29 +390,29 @@ func GetCurrResult(network *network.NetworkInfo, endpoint *network.EndpointInfo,
ip4.InterfaceIndex = 0

cIP4 := cniTypesCurr.IPConfig{
Version: ip4.Version,
Address: net.IPNet{
IP: ip4.Address.IP,
Mask: ip4.Address.Mask},
Gateway: ip4.Gateway,
Interface: &ip4.InterfaceIndex,
Version: ip4.Version,
Address: net.IPNet{
IP: ip4.Address.IP,
Mask: ip4.Address.Mask},
Gateway: ip4.Gateway,
Interface: &ip4.InterfaceIndex,
}

result.IPs = append(result.IPs, &cIP4)

if ip6 != nil {
if ip6 != nil {

ip6.InterfaceIndex = 0

cIP6 := cniTypesCurr.IPConfig{
Version: ip6.Version,
Address: net.IPNet{
IP: ip6.Address.IP,
Mask: ip6.Address.Mask},
Gateway: ip6.Gateway,
Interface: &ip6.InterfaceIndex,
Version: ip6.Version,
Address: net.IPNet{
IP: ip6.Address.IP,
Mask: ip6.Address.Mask},
Gateway: ip6.Gateway,
Interface: &ip6.InterfaceIndex,
}

result.IPs = append(result.IPs, &cIP6)
}
}
Expand Down Expand Up @@ -440,23 +447,23 @@ func GetDualStackAddresses(endpoint *network.EndpointInfo) (*IP, *IP) {

var ip4 *IP
var ip6 *IP

ip4address := net.IPNet{}
ip4address.IP = endpoint.IPAddress
ip4address.Mask = endpoint.IP4Mask
ip4address.Mask = endpoint.IP4Mask

ip4 = &IP{
Version: "4",
Address: cniTypes.IPNet(ip4address),
Gateway: endpoint.Gateway,
Version: "4",
Address: cniTypes.IPNet(ip4address),
Gateway: endpoint.Gateway,
InterfaceIndex: 0,
}

if endpoint.IPAddress6.IP != nil {
ip6 = &IP{
Version: "6",
Address: cniTypes.IPNet(endpoint.IPAddress6),
Gateway: endpoint.Gateway6,
Version: "6",
Address: cniTypes.IPNet(endpoint.IPAddress6),
Gateway: endpoint.Gateway6,
InterfaceIndex: 0,
}
}
Expand Down
20 changes: 17 additions & 3 deletions common/core/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,11 @@ func (plugin *netPlugin) Add(args *cniSkel.CmdArgs) (resultError error) {

// Convert cniConfig to NetworkInfo
// We don't set namespace, setting namespace is not valid for EP creation
networkInfo := cniConfig.GetNetworkInfo(k8sNamespace)
networkInfo, err := cniConfig.GetNetworkInfo(k8sNamespace)
if err != nil {
logrus.Errorf("[cni-net] Failed to get network information from network configuration, err:%v.", err)
return err
}
epInfo, err := cniConfig.GetEndpointInfo(networkInfo, args.ContainerID, "")

if err != nil {
Expand Down Expand Up @@ -203,6 +207,12 @@ func (plugin *netPlugin) Add(args *cniSkel.CmdArgs) (resultError error) {
// Apply the Network Policy for Endpoint
epInfo.Policies = append(epInfo.Policies, networkInfo.Policies...)

// If LoopbackDSR is set, add to policies
if cniConfig.OptionalFlags.LoopbackDSR {
hcnLoopbackRoute, _ := network.GetLoopbackDSRPolicy(&epInfo.IPAddress)
epInfo.Policies = append(epInfo.Policies, hcnLoopbackRoute)
}

epInfo, err = plugin.nm.CreateEndpoint(nwConfig.ID, epInfo, args.Netns)
if err != nil {
logrus.Errorf("[cni-net] Failed to create endpoint, error : %v.", err)
Expand All @@ -217,7 +227,7 @@ func (plugin *netPlugin) Add(args *cniSkel.CmdArgs) (resultError error) {
}

result.Print()
logrus.Debugf("[cni-net] result: %v", result.String())
logrus.Debugf("[cni-net] result: %+v", result)
return nil
}

Expand Down Expand Up @@ -381,7 +391,11 @@ func (plugin *netPlugin) Delete(args *cniSkel.CmdArgs) error {
}

// Convert cniConfig to NetworkInfo
networkInfo := cniConfig.GetNetworkInfo(k8sNamespace)
networkInfo, err := cniConfig.GetNetworkInfo(k8sNamespace)
if err != nil {
logrus.Errorf("[cni-net] Failed to get network information from network configuration, err:%v.", err)
return err
}
epInfo, err := cniConfig.GetEndpointInfo(networkInfo, args.ContainerID, args.Netns)
if err != nil {
return err
Expand Down
5 changes: 3 additions & 2 deletions example/flannel_l2bridge.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
        "dnsCapabilities": true
    },
    "delegate": {
        "type": "sdnoverlay",
        "type": "sdnbridge",
"optionalFlags" : {
"forceBridgeGateway" : true
"forceBridgeGateway" : true,
"loopbackDSR": false
},
        "AdditionalArgs": [
            {
Expand Down
3 changes: 3 additions & 0 deletions example/flannel_overlay.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
    },
    "delegate": {
        "type": "sdnoverlay",
"optionalFlags" : {
"loopbackDSR": false
},
        "AdditionalArgs": [
            {
                "Name": "EndpointPolicy",
Expand Down
3 changes: 3 additions & 0 deletions example/l2bridge.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"portMappings": true,
"dnsCapabilities": true
},
"optionalFlags" : {
"loopbackDSR": false
},
"ipam": {
"subnet": "192.168.1.0/24",
"routes": [
Expand Down
3 changes: 3 additions & 0 deletions example/l2tunnel.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
"name": "l2tunnelNetwork",
"type": "l2tunnel",
"master": "Ethernet",
"optionalFlags" : {
"loopbackDSR": false
},
"ipam": {
"type": "azure-vnet-ipam",
"Subnet": "10.240.0.0/12"
Expand Down
26 changes: 13 additions & 13 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@ module github.com/Microsoft/windows-container-networking
go 1.12

require (
github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5
github.com/Microsoft/hcsshim v0.8.9
github.com/Microsoft/hcsshim/test v0.0.0-20200715222032-5eafd1556990
github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3
github.com/Microsoft/hcsshim v0.8.15
github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50 // indirect
github.com/containerd/go-runc v0.0.0-20190226155025-7d11b49dc076
github.com/containernetworking/cni v0.0.0-20190403160241-0471e018e593
github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68 // indirect
github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328
github.com/containernetworking/cni v0.8.0
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
github.com/godbus/dbus v4.1.0+incompatible // indirect
github.com/hashicorp/go-multierror v1.0.0 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/opencontainers/runtime-tools v0.0.0-20190313075039-7125f1d443b0
github.com/opencontainers/selinux v1.2.1 // indirect
github.com/pkg/errors v0.8.1
github.com/prometheus/procfs v0.0.5 // indirect
github.com/sirupsen/logrus v1.4.2
github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 // indirect
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
github.com/xeipuuv/gojsonschema v1.1.0 // indirect
golang.org/x/sync v0.0.0-20190423024810-112230192c58
go.opencensus.io v0.23.0 // indirect
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 // indirect
)
Loading