Skip to content

Returning IPAddress instead of IPPrefix in CNI ADD response #2038

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

Merged
merged 9 commits into from
Jul 18, 2023
Merged

Returning IPAddress instead of IPPrefix in CNI ADD response #2038

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0e38563
Returning IPAddress instead of IPPrefix in CNI ADD response
ronak-31 Jun 29, 2023
85d60fd
Addressing review comments.
ronak-31 Jul 4, 2023
e313368
Resolving conflicts.
ronak-31 Jul 14, 2023
5e54a8d
Merge branch 'master' of https://github.com/Azure/azure-container-net…
ronak-31 Jul 14, 2023
e371270
Resolving review comments
ronak-31 Jul 14, 2023
e80d69c
Merge branch 'master' into ronak-31/return_ipaddress_cni_add
ronak-31 Jul 14, 2023
a03488f
Merge branch 'master' of https://github.com/Azure/azure-container-net…
ronak-31 Jul 14, 2023
5d43dc4
Using constants for prefixlength
ronak-31 Jul 14, 2023
afe642a
Merge branch 'ronak-31/return_ipaddress_cni_add' of https://github.co…
ronak-31 Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions cni/network/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"fmt"
"net"
"os"
"strconv"
"time"

"github.com/Azure/azure-container-networking/aitelemetry"
Expand Down Expand Up @@ -41,6 +42,8 @@ const (
// Supported IP version. Currently support only IPv4
ipamV6 = "azure-vnet-ipamv6"
defaultRequestTimeout = 15 * time.Second
ipv4FullMask = 32
ipv6FullMask = 128
)

// CNI Operation Types
Expand Down Expand Up @@ -1341,20 +1344,30 @@ func convertNnsToCniResult(

intIndex := i
for _, ip := range ni.Ipaddresses {
ipAddr := net.ParseIP(ip.Ip)

ipWithPrefix := fmt.Sprintf("%s/%s", ip.Ip, ip.PrefixLength)
_, ipNet, err := net.ParseCIDR(ipWithPrefix)
prefixLength, err := strconv.Atoi(ip.PrefixLength)
if err != nil {
log.Logger.Error("Error while converting to cni result",
log.Logger.Error("Error parsing prefix length while converting to cni result",
zap.String("prefixLength", ip.PrefixLength),
zap.String("operation", operationName),
zap.String("pod", podName),
zap.Error(err))
continue
}

address := net.IPNet{
IP: ipAddr,
Mask: net.CIDRMask(prefixLength, ipv6FullMask),
}

if ipAddr.To4() != nil {
address.Mask = net.CIDRMask(prefixLength, ipv4FullMask)
}

gateway := net.ParseIP(ip.DefaultGateway)
ipConfig := &cniTypesCurr.IPConfig{
Address: *ipNet,
Address: address,
Gateway: gateway,
Interface: &intIndex,
}
Expand Down