Merge pull request #1890 from rbrtbnfgl/podcidrcheck

Added additional check for n.spec.podCIDRs
flannel-io · Mar 1, 2024 · ee53746 · ee53746
2 parents bbe829e + 6794631
commit ee53746
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pkg/subnet/kube/kube.go b/pkg/subnet/kube/kube.go
@@ -493,6 +493,9 @@ func (ksm *kubeSubnetManager) nodeToLease(n v1.Node) (l lease.Lease, err error)
 		default:
 			return l, fmt.Errorf("node %q pod cidrs should be IPv4/IPv6 only or dualstack", ksm.nodeName)
 		}
+		if cidr == nil {
+			return l, fmt.Errorf("Missing IPv4 address on n.Spec.PodCIDRs")
+		}
 		l.Subnet = ip.FromIPNet(cidr)
 		l.EnableIPv4 = ksm.enableIPv4
 	}
@@ -526,6 +529,9 @@ func (ksm *kubeSubnetManager) nodeToLease(n v1.Node) (l lease.Lease, err error)
 		default:
 			return l, fmt.Errorf("node %q pod cidrs should be IPv4/IPv6 only or dualstack", ksm.nodeName)
 		}
+		if ipv6Cidr == nil {
+			return l, fmt.Errorf("Missing IPv6 address on n.Spec.PodCIDRs")
+		}
 		l.IPv6Subnet = ip.FromIP6Net(ipv6Cidr)
 		l.EnableIPv6 = ksm.enableIPv6
 	}