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

Cherry-pick: Also take secondary CIDRs into account when checking for validity of IPv4NativeRoutingCIDR #161

Closed
wants to merge 2 commits into from
Closed

Cherry-pick: Also take secondary CIDRs into account when checking for validity of IPv4NativeRoutingCIDR #161

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7840b4
Move auto detection logic for IPv4NativeRoutingCIDR into own function
codablock Jan 28, 2022
00d414e
Also take secondary CIDRs into account when checking IPv4NativeRoutin…
codablock Jan 28, 2022
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
71 changes: 47 additions & 24 deletions pkg/ipam/crd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,14 +215,20 @@ func newNodeStore(nodeName string, conf Configuration, owner Owner, k8sEventReg
return store
}

func deriveVpcCIDR(node *ciliumv2.CiliumNode) (result *cidr.CIDR) {
func deriveVpcCIDRs(node *ciliumv2.CiliumNode) (primaryCIDR *cidr.CIDR, secondaryCIDRs []*cidr.CIDR) {
if len(node.Status.ENI.ENIs) > 0 {
// A node belongs to a single VPC so we can pick the first ENI
// in the list and derive the VPC CIDR from it.
for _, eni := range node.Status.ENI.ENIs {
c, err := cidr.ParseCIDR(eni.VPC.PrimaryCIDR)
if err == nil {
result = c
primaryCIDR = c
for _, sc := range eni.VPC.CIDRs {
c, err = cidr.ParseCIDR(sc)
if err == nil {
secondaryCIDRs = append(secondaryCIDRs, c)
}
}
return
}
}
Expand All @@ -231,7 +237,7 @@ func deriveVpcCIDR(node *ciliumv2.CiliumNode) (result *cidr.CIDR) {
for _, azif := range node.Status.Azure.Interfaces {
c, err := cidr.ParseCIDR(azif.CIDR)
if err == nil {
result = c
primaryCIDR = c
return
}
}
Expand All @@ -240,13 +246,49 @@ func deriveVpcCIDR(node *ciliumv2.CiliumNode) (result *cidr.CIDR) {
if len(node.Status.AlibabaCloud.ENIs) > 0 {
c, err := cidr.ParseCIDR(node.Spec.AlibabaCloud.CIDRBlock)
if err == nil {
result = c
primaryCIDR = c
return
}
}
return
}

func (n *nodeStore) autoDetectIPv4NativeRoutingCIDR() bool {
if primaryCIDR, secondaryCIDRs := deriveVpcCIDRs(n.ownNode); primaryCIDR != nil {
allCIDRs := append([]*cidr.CIDR{primaryCIDR}, secondaryCIDRs...)
if nativeCIDR := n.conf.GetIPv4NativeRoutingCIDR(); nativeCIDR != nil {
found := false
for _, vpcCIDR := range allCIDRs {
logFields := logrus.Fields{
"vpc-cidr": vpcCIDR.String(),
option.IPv4NativeRoutingCIDR: nativeCIDR.String(),
}

ranges4, _ := ip.CoalesceCIDRs([]*net.IPNet{nativeCIDR.IPNet, vpcCIDR.IPNet})
if len(ranges4) != 1 {
log.WithFields(logFields).Info("Native routing CIDR does not contain VPC CIDR, trying next")
} else {
found = true
log.WithFields(logFields).Info("Native routing CIDR contains VPC CIDR, ignoring autodetected VPC CIDRs.")
break
}
}
if !found {
log.Fatal("None of the VPC CIDRs contains the specified native routing CIDR")
}
} else {
log.WithFields(logrus.Fields{
"vpc-cidr": primaryCIDR.String(),
}).Info("Using autodetected primary VPC CIDR.")
n.conf.SetIPv4NativeRoutingCIDR(primaryCIDR)
}
return true
} else {
log.Info("Could not determine VPC CIDRs")
return false
}
}

// hasMinimumIPsInPool returns true if the required number of IPs is available
// in the allocation pool. It also returns the number of IPs required and
// available.
Expand Down Expand Up @@ -284,26 +326,7 @@ func (n *nodeStore) hasMinimumIPsInPool() (minimumReached bool, required, numAva
}

if n.conf.IPAMMode() == ipamOption.IPAMENI || n.conf.IPAMMode() == ipamOption.IPAMAzure || n.conf.IPAMMode() == ipamOption.IPAMAlibabaCloud {
if vpcCIDR := deriveVpcCIDR(n.ownNode); vpcCIDR != nil {
if nativeCIDR := n.conf.IPv4NativeRoutingCIDR(); nativeCIDR != nil {
logFields := logrus.Fields{
"vpc-cidr": vpcCIDR.String(),
option.IPv4NativeRoutingCIDR: nativeCIDR.String(),
}

ranges4, _ := ip.CoalesceCIDRs([]*net.IPNet{nativeCIDR.IPNet, vpcCIDR.IPNet})
if len(ranges4) != 1 {
log.WithFields(logFields).Fatal("Native routing CIDR does not contain VPC CIDR.")
} else {
log.WithFields(logFields).Info("Ignoring autodetected VPC CIDR.")
}
} else {
log.WithFields(logrus.Fields{
"vpc-cidr": vpcCIDR.String(),
}).Info("Using autodetected VPC CIDR.")
n.conf.SetIPv4NativeRoutingCIDR(vpcCIDR)
}
} else {
if !n.autoDetectIPv4NativeRoutingCIDR() {
minimumReached = false
}
}
Expand Down