From 0c5ec73d606ec44e49ecfdb13622b96a61660c87 Mon Sep 17 00:00:00 2001
From: Vasilev Andrew <landeleih@protonmail.com>
Date: Wed, 16 Aug 2023 15:00:46 +0200
Subject: [PATCH 1/3] Deprecated netaddr replaced with default netip library

---
 api/v1alpha1/cidr_types.go        | 104 ++++++++++++++++--------------
 api/v1alpha1/cidr_types_test.go   |  19 +++---
 api/v1alpha1/ipaddr_types.go      |  11 ++--
 api/v1alpha1/ipaddr_types_test.go |  11 ++--
 api/v1alpha1/subnet_types.go      |   4 +-
 go.mod                            |   1 +
 go.sum                            |   2 +
 7 files changed, 80 insertions(+), 72 deletions(-)

diff --git a/api/v1alpha1/cidr_types.go b/api/v1alpha1/cidr_types.go
index d31981a..d389fee 100644
--- a/api/v1alpha1/cidr_types.go
+++ b/api/v1alpha1/cidr_types.go
@@ -17,30 +17,34 @@ package v1alpha1
 import (
 	"encoding/json"
 	"math/big"
+	"net/netip"
 
-	"inet.af/netaddr"
+	"go4.org/netipx"
 )
 
 // +kubebuilder:validation:Type=string
 type CIDR struct {
-	Net netaddr.IPPrefix `json:"-"`
+	Net     netip.Prefix   `json:"-"`
+	IPRange netipx.IPRange `json:"-"`
 }
 
 func CIDRFromString(cidrString string) (*CIDR, error) {
-	cidr, err := netaddr.ParseIPPrefix(cidrString)
+	cidr, err := netip.ParsePrefix(cidrString)
 	if err != nil {
 		return nil, err
 	}
+	ipRange := netipx.RangeOfPrefix(cidr)
 	return &CIDR{
-		Net: cidr,
+		Net:     cidr,
+		IPRange: ipRange,
 	}, nil
 }
 
-func CIDRFromNet(n netaddr.IPPrefix) *CIDR {
+func CIDRFromNet(n netip.Prefix) *CIDR {
 	return &CIDR{Net: n}
 }
 
-func (in CIDR) MarshalJSON() ([]byte, error) {
+func (in *CIDR) MarshalJSON() ([]byte, error) {
 	return json.Marshal(in.String())
 }
 
@@ -52,7 +56,7 @@ func (in *CIDR) UnmarshalJSON(b []byte) error {
 	if err := json.Unmarshal(b, &stringVal); err != nil {
 		return err
 	}
-	pIP, err := netaddr.ParseIPPrefix(stringVal)
+	pIP, err := netip.ParsePrefix(stringVal)
 	if err != nil {
 		return err
 	}
@@ -61,22 +65,22 @@ func (in *CIDR) UnmarshalJSON(b []byte) error {
 }
 
 func (in *CIDR) MaskBits() byte {
-	return in.Net.IP().BitLen()
+	return byte(in.Net.Addr().BitLen())
 }
 
 func (in *CIDR) MaskOnes() byte {
-	return in.Net.Bits()
+	return byte(in.Net.Bits())
 }
 
 func (in *CIDR) MaskZeroes() byte {
 	ones := in.Net.Bits()
-	bits := in.Net.IP().BitLen()
-	return bits - ones
+	bits := in.Net.Addr().BitLen()
+	return byte(bits - ones)
 }
 
 func (in *CIDR) AddressCapacity() *big.Int {
 	ones := in.Net.Bits()
-	bits := in.Net.IP().BitLen()
+	bits := in.Net.Addr().BitLen()
 
 	ac := big.Int{}
 	ac.Exp(big.NewInt(2), big.NewInt(int64(bits-ones)), nil)
@@ -91,16 +95,16 @@ func (in *CIDR) MaskCapacity() *big.Int {
 	return count
 }
 
-func (in *CIDR) ToAddressRange() (netaddr.IP, netaddr.IP) {
-	return in.Net.Range().From(), in.Net.Range().To()
+func (in *CIDR) ToAddressRange() (netip.Addr, netip.Addr) {
+	return in.IPRange.From(), in.IPRange.To()
 }
 
 func (in *CIDR) Equal(cidr *CIDR) bool {
 	ourOnes := in.Net.Bits()
-	ourBits := in.Net.IP().BitLen()
+	ourBits := in.Net.Addr().BitLen()
 
 	theirOnes := cidr.Net.Bits()
-	theirBits := cidr.Net.IP().BitLen()
+	theirBits := cidr.Net.Addr().BitLen()
 	firstOurIP, _ := in.ToAddressRange()
 	firstTheirIP, _ := cidr.ToAddressRange()
 
@@ -111,32 +115,32 @@ func (in *CIDR) Equal(cidr *CIDR) bool {
 
 func (in *CIDR) IsLeft() bool {
 	ones := in.Net.Bits()
-	bits := in.Net.IP().BitLen()
+	bits := in.Net.Addr().BitLen()
 	if ones == 0 {
 		return false
 	}
 	return in.isLeft(ones, bits)
 }
 
-func (in *CIDR) isLeft(ones, bits uint8) bool {
+func (in *CIDR) isLeft(ones, bits int) bool {
 	var ipBytes []byte
-	if in.Net.IP().Is4() {
-		ipv4 := in.Net.IP().As4()
+	if in.Net.Addr().Is4() {
+		ipv4 := in.Net.Addr().As4()
 		ipBytes = ipv4[:]
 	} else {
-		ipv6 := in.Net.IP().As16()
+		ipv6 := in.Net.Addr().As16()
 		ipBytes = ipv6[:]
 	}
 	ipLen := len(ipBytes)
 	bitsDiff := bits - ones
-	ipIdx := uint8(ipLen) - bitsDiff/8 - 1
+	ipIdx := ipLen - bitsDiff/8 - 1
 	ipBit := bitsDiff % 8
 	return ipBytes[ipIdx]&(1<<ipBit) == 0
 }
 
 func (in *CIDR) IsRight() bool {
 	ones := in.Net.Bits()
-	bits := in.Net.IP().BitLen()
+	bits := in.Net.Addr().BitLen()
 	if ones == 0 {
 		return false
 	}
@@ -160,7 +164,7 @@ func (in *CIDR) Join(cidr *CIDR) {
 		return
 	}
 	ourOnes := in.Net.Bits()
-	ourBits := in.Net.IP().BitLen()
+	ourBits := in.Net.Addr().BitLen()
 
 	joinOnes := ourOnes - 1
 	joinBitsDiff := ourBits - joinOnes
@@ -182,26 +186,26 @@ func (in *CIDR) Join(cidr *CIDR) {
 	}
 	ipLen := len(ipBytes)
 
-	joinIPIdx := uint8(ipLen) - joinIPBitGlobalIdx/8 - 1
+	joinIPIdx := ipLen - joinIPBitGlobalIdx/8 - 1
 	ipBytes[joinIPIdx] &= 0xff << joinIPBitLocalIdx
 
 	if in.IsIPv6() {
 		ipv6 := (*[16]byte)(ipBytes)
-		ip := netaddr.IPPrefixFrom(netaddr.IPFrom16(*ipv6), joinOnes)
+		ip := netip.PrefixFrom(netip.AddrFrom16(*ipv6), joinOnes)
 		in.Net = ip
 		return
 	}
 	ipv4 := (*[4]byte)(ipBytes)
-	ip := netaddr.IPPrefixFrom(netaddr.IPFrom4(*ipv4), joinOnes)
+	ip := netip.PrefixFrom(netip.AddrFrom4(*ipv4), joinOnes)
 	in.Net = ip
 }
 
 func (in *CIDR) CanJoin(cidr *CIDR) bool {
 	ourOnes := in.Net.Bits()
-	ourBits := in.Net.IP().BitLen()
+	ourBits := in.Net.Addr().BitLen()
 
 	theirOnes := cidr.Net.Bits()
-	theirBits := cidr.Net.IP().BitLen()
+	theirBits := cidr.Net.Addr().BitLen()
 
 	ourBitsDiff := ourBits - ourOnes
 	if ourBitsDiff == ourBits {
@@ -209,7 +213,7 @@ func (in *CIDR) CanJoin(cidr *CIDR) bool {
 	}
 	otherBitsDiff := ourBitsDiff
 
-	var otherIPAddr netaddr.IP
+	var otherIPAddr netip.Addr
 	var otherIP []byte
 	firstOtherIP, _ := in.ToAddressRange()
 	firstTheirIP, _ := cidr.ToAddressRange()
@@ -224,17 +228,17 @@ func (in *CIDR) CanJoin(cidr *CIDR) bool {
 		otherIP = ipv4[:]
 	}
 
-	ipLen := uint8(len(otherIP))
+	ipLen := len(otherIP)
 	otherIPIdx := ipLen - otherBitsDiff/8 - 1
 	otherIPBit := otherBitsDiff % 8
 	otherIP[otherIPIdx] = otherIP[otherIPIdx] ^ (1 << otherIPBit)
 
 	if isIPv6 {
 		ipv6 := (*[16]byte)(otherIP)
-		otherIPAddr = netaddr.IPFrom16(*ipv6)
+		otherIPAddr = netip.AddrFrom16(*ipv6)
 	} else {
 		ipv4 := (*[4]byte)(otherIP)
-		otherIPAddr = netaddr.IPFrom4(*ipv4)
+		otherIPAddr = netip.AddrFrom4(*ipv4)
 	}
 
 	if firstTheirIP.Compare(otherIPAddr) == 0 &&
@@ -247,9 +251,9 @@ func (in *CIDR) CanJoin(cidr *CIDR) bool {
 
 func (in *CIDR) Reserve(cidr *CIDR) []CIDR {
 	ourOnes := in.Net.Bits()
-	ourBits := in.Net.IP().BitLen()
+	ourBits := in.Net.Addr().BitLen()
 	theirOnes := cidr.Net.Bits()
-	theirBits := cidr.Net.IP().BitLen()
+	theirBits := cidr.Net.Addr().BitLen()
 
 	// Check if addresses/masks are the same length
 	if ourBits != theirBits {
@@ -263,7 +267,7 @@ func (in *CIDR) Reserve(cidr *CIDR) []CIDR {
 
 	// If capacities are equal, then net IPs should be also equal
 	// Otherwise networks are not the same
-	if ourOnes == theirOnes && in.Net.IP().Compare(cidr.Net.IP()) == 0 {
+	if ourOnes == theirOnes && in.Net.Addr().Compare(cidr.Net.Addr()) == 0 {
 		return []CIDR{}
 	}
 
@@ -277,14 +281,14 @@ func (in *CIDR) Reserve(cidr *CIDR) []CIDR {
 	var currentIP []byte
 	theirFirstIP, _ := cidr.ToAddressRange()
 	if isIPv6 {
-		ipv6 := in.Net.IP().As16()
+		ipv6 := in.Net.Addr().As16()
 		currentIP = ipv6[:]
 	} else {
 		firstIP, _ := in.ToAddressRange()
 		ipv4 := firstIP.As4()
 		currentIP = ipv4[:]
 	}
-	ipLen := uint8(len(currentIP))
+	ipLen := len(currentIP)
 
 	for leftInsertIdx <= rightInsertIdx {
 		leftIP := make([]byte, ipLen)
@@ -297,17 +301,17 @@ func (in *CIDR) Reserve(cidr *CIDR) []CIDR {
 		rightIPBit := prevBitsDiff % 8
 		rightIP[rightIPIdx] = rightIP[rightIPIdx] | (1 << rightIPBit)
 
-		var leftNet, rightNet netaddr.IPPrefix
+		var leftNet, rightNet netip.Prefix
 		if isIPv6 {
 			leftIpv6Bytes := (*[16]byte)(leftIP)
 			rightIpv6Bytes := (*[16]byte)(rightIP)
-			leftNet = netaddr.IPPrefixFrom(netaddr.IPFrom16(*leftIpv6Bytes), splitOnes)
-			rightNet = netaddr.IPPrefixFrom(netaddr.IPFrom16(*rightIpv6Bytes), splitOnes)
+			leftNet = netip.PrefixFrom(netip.AddrFrom16(*leftIpv6Bytes), splitOnes)
+			rightNet = netip.PrefixFrom(netip.AddrFrom16(*rightIpv6Bytes), splitOnes)
 		} else {
 			leftIpv4Bytes := (*[4]byte)(leftIP)
 			rightIpv4Bytes := (*[4]byte)(rightIP)
-			leftNet = netaddr.IPPrefixFrom(netaddr.IPFrom4(*leftIpv4Bytes), splitOnes)
-			rightNet = netaddr.IPPrefixFrom(netaddr.IPFrom4(*rightIpv4Bytes), splitOnes)
+			leftNet = netip.PrefixFrom(netip.AddrFrom4(*leftIpv4Bytes), splitOnes)
+			rightNet = netip.PrefixFrom(netip.AddrFrom4(*rightIpv4Bytes), splitOnes)
 		}
 
 		if leftNet.Contains(theirFirstIP) {
@@ -328,9 +332,9 @@ func (in *CIDR) Reserve(cidr *CIDR) []CIDR {
 
 func (in *CIDR) CanReserve(cidr *CIDR) bool {
 	ourOnes := in.Net.Bits()
-	ourBits := in.Net.IP().BitLen()
+	ourBits := in.Net.Addr().BitLen()
 	theirOnes := cidr.Net.Bits()
-	theirBits := cidr.Net.IP().BitLen()
+	theirBits := cidr.Net.Addr().BitLen()
 
 	// Check if addresses/masks are the same length
 	if ourBits != theirBits {
@@ -351,18 +355,18 @@ func (in *CIDR) CanReserve(cidr *CIDR) bool {
 		return ourFirstIP.Compare(theirFirstIP) == 0
 	}
 
-	if !in.Net.Contains(cidr.Net.IP()) {
+	if !in.Net.Contains(cidr.Net.Addr()) {
 		return false
 	}
 	return true
 }
 
 func (in *CIDR) IsIPv4() bool {
-	return in.Net.IP().Is4()
+	return in.Net.Addr().Is4()
 }
 
 func (in *CIDR) IsIPv6() bool {
-	return in.Net.IP().Is6()
+	return in.Net.Addr().Is6()
 }
 
 func (in *CIDR) String() string {
@@ -371,14 +375,14 @@ func (in *CIDR) String() string {
 
 func (in *CIDR) AsIPAddr() *IPAddr {
 	return &IPAddr{
-		Net: in.Net.IP(),
+		Net: in.Net.Addr(),
 	}
 }
 
 // DeepCopyInto is an deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *CIDR) DeepCopyInto(out *CIDR) {
 	*out = *in
-	if in.Net.IP().String() != "" {
+	if in.Net.Addr().String() != "" {
 		out.Net = in.Net
 	}
 }
diff --git a/api/v1alpha1/cidr_types_test.go b/api/v1alpha1/cidr_types_test.go
index a59f8ce..e90e4d2 100644
--- a/api/v1alpha1/cidr_types_test.go
+++ b/api/v1alpha1/cidr_types_test.go
@@ -16,10 +16,10 @@ package v1alpha1
 
 import (
 	"fmt"
+	"net/netip"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"inet.af/netaddr"
 	"k8s.io/apimachinery/pkg/util/json"
 )
 
@@ -81,10 +81,10 @@ var _ = Describe("CIDR operations", func() {
 				By(fmt.Sprintf("Comparing to expected address range %d", i))
 				first, last := cidr.ToAddressRange()
 
-				firstIP := netaddr.MustParseIP(testCase.firstIP)
+				firstIP := netip.MustParseAddr(testCase.firstIP)
 				Expect(firstIP.Compare(first)).To(Equal(0))
 
-				lastIP := netaddr.MustParseIP(testCase.lastIP)
+				lastIP := netip.MustParseAddr(testCase.lastIP)
 				Expect(lastIP.Compare(last)).To(Equal(0))
 
 			}
@@ -98,21 +98,22 @@ var _ = Describe("CIDR operations", func() {
 				expectedJSON string
 			}{
 				{
-					cidr:         CIDRFromNet(netaddr.IPPrefixFrom(netaddr.IPv4(192, 168, 1, 0), 24)),
+					cidr:         CIDRFromNet(netip.PrefixFrom(netip.AddrFrom4([4]byte{192, 168, 1, 0}), 24)),
 					expectedJSON: `"192.168.1.0/24"`,
 				},
 				{
-					cidr:         CIDRFromNet(netaddr.IPPrefixFrom(netaddr.IPv4(0, 0, 0, 0), 0)),
+					cidr:         CIDRFromNet(netip.PrefixFrom(netip.AddrFrom4([4]byte{0, 0, 0, 0}), 0)),
 					expectedJSON: `"0.0.0.0/0"`,
 				},
 				{
-					cidr: CIDRFromNet(netaddr.IPPrefixFrom(
-						netaddr.IPFrom16([16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}), 0)),
+					cidr: CIDRFromNet(netip.PrefixFrom(netip.AddrFrom16(
+						[16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}), 0)),
 					expectedJSON: `"::/0"`,
 				},
 				{
-					cidr: CIDRFromNet(netaddr.IPPrefixFrom(
-						netaddr.IPFrom16([16]byte{0x20, 0x1, 0xd, 0xb8, 0x12, 0x34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}), 48)),
+					cidr: CIDRFromNet(netip.PrefixFrom(
+						netip.AddrFrom16(
+							[16]byte{0x20, 0x1, 0xd, 0xb8, 0x12, 0x34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}), 48)),
 					expectedJSON: `"2001:db8:1234::/48"`,
 				},
 			}
diff --git a/api/v1alpha1/ipaddr_types.go b/api/v1alpha1/ipaddr_types.go
index 6b87a74..00347d9 100644
--- a/api/v1alpha1/ipaddr_types.go
+++ b/api/v1alpha1/ipaddr_types.go
@@ -16,12 +16,11 @@ package v1alpha1
 
 import (
 	"encoding/json"
-
-	"inet.af/netaddr"
+	"net/netip"
 )
 
 func IPAddrFromString(ipString string) (*IPAddr, error) {
-	ip, err := netaddr.ParseIP(ipString)
+	ip, err := netip.ParseAddr(ipString)
 	if err != nil {
 		return nil, err
 	}
@@ -30,7 +29,7 @@ func IPAddrFromString(ipString string) (*IPAddr, error) {
 
 // +kubebuilder:validation:Type=string
 type IPAddr struct {
-	Net netaddr.IP `json:"-"`
+	Net netip.Addr `json:"-"`
 }
 
 func (in IPAddr) MarshalJSON() ([]byte, error) {
@@ -45,7 +44,7 @@ func (in *IPAddr) UnmarshalJSON(b []byte) error {
 	if err := json.Unmarshal(b, &stringVal); err != nil {
 		return err
 	}
-	pIP, err := netaddr.ParseIP(stringVal)
+	pIP, err := netip.ParseAddr(stringVal)
 	if err != nil {
 		return err
 	}
@@ -67,7 +66,7 @@ func (in *IPAddr) AsCidr() *CIDR {
 		cidrRange = 128
 	}
 
-	ipNet := netaddr.IPPrefixFrom(in.Net, cidrRange)
+	ipNet := netip.PrefixFrom(in.Net, int(cidrRange))
 	return CIDRFromNet(ipNet)
 }
 
diff --git a/api/v1alpha1/ipaddr_types_test.go b/api/v1alpha1/ipaddr_types_test.go
index a3669f7..5a8a4c0 100644
--- a/api/v1alpha1/ipaddr_types_test.go
+++ b/api/v1alpha1/ipaddr_types_test.go
@@ -16,10 +16,10 @@ package v1alpha1
 
 import (
 	"fmt"
+	"net/netip"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"inet.af/netaddr"
 	"k8s.io/apimachinery/pkg/util/json"
 )
 
@@ -50,25 +50,26 @@ var _ = Describe("IP operations", func() {
 			}{
 				{
 					ip: &IPAddr{
-						Net: netaddr.IPv4(192, 168, 1, 0),
+						Net: netip.AddrFrom4([4]byte{192, 168, 1, 0}),
 					},
 					expectedJSON: `"192.168.1.0"`,
 				},
 				{
 					ip: &IPAddr{
-						Net: netaddr.IPv4(0, 0, 0, 0),
+						Net: netip.AddrFrom4([4]byte{0, 0, 0, 0}),
 					},
 					expectedJSON: `"0.0.0.0"`,
 				},
 				{
 					ip: &IPAddr{
-						Net: netaddr.IPv6Raw([16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}),
+						Net: netip.AddrFrom16([16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}),
 					},
 					expectedJSON: `"::"`,
 				},
 				{
 					ip: &IPAddr{
-						Net: netaddr.IPv6Raw([16]byte{0x20, 0x1, 0xd, 0xb8, 0x12, 0x34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}),
+						Net: netip.AddrFrom16(
+							[16]byte{0x20, 0x1, 0xd, 0xb8, 0x12, 0x34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}),
 					},
 					expectedJSON: `"2001:db8:1234::"`,
 				},
diff --git a/api/v1alpha1/subnet_types.go b/api/v1alpha1/subnet_types.go
index bfd0010..18d91d1 100644
--- a/api/v1alpha1/subnet_types.go
+++ b/api/v1alpha1/subnet_types.go
@@ -18,9 +18,9 @@ package v1alpha1
 
 import (
 	"math/big"
+	"net/netip"
 
 	"github.com/pkg/errors"
-	"inet.af/netaddr"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -243,7 +243,7 @@ func (in *Subnet) ProposeForBits(prefixBits byte) (*CIDR, error) {
 
 	firstIP, _ := candidateCidr.ToAddressRange()
 
-	ipNet := netaddr.IPPrefixFrom(firstIP, prefixBits)
+	ipNet := netip.PrefixFrom(firstIP, int(prefixBits))
 	return CIDRFromNet(ipNet), nil
 }
 
diff --git a/go.mod b/go.mod
index 6986c9a..d917ad1 100644
--- a/go.mod
+++ b/go.mod
@@ -8,6 +8,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.11.0
 	github.com/onsi/gomega v1.27.10
 	github.com/pkg/errors v0.9.1
+	go4.org/netipx v0.0.0-20230728184502-ec4c8b891b28
 	gopkg.in/inf.v0 v0.9.1
 	inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6
 	k8s.io/api v0.27.4
diff --git a/go.sum b/go.sum
index 307ffa4..acc0fc6 100644
--- a/go.sum
+++ b/go.sum
@@ -153,6 +153,8 @@ go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
 go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
 go4.org/intern v0.0.0-20211027215823-ae77deb06f29 h1:UXLjNohABv4S58tHmeuIZDO6e3mHpW2Dx33gaNt03LE=
 go4.org/intern v0.0.0-20211027215823-ae77deb06f29/go.mod h1:cS2ma+47FKrLPdXFpr7CuxiTW3eyJbWew4qx0qtQWDA=
+go4.org/netipx v0.0.0-20230728184502-ec4c8b891b28 h1:zLxFnORHDFTSkJPawMU7LzsuGQJ4MUFS653jJHpORow=
+go4.org/netipx v0.0.0-20230728184502-ec4c8b891b28/go.mod h1:TQvodOM+hJTioNQJilmLXu08JNb8i+ccq418+KWu1/Y=
 go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
 go4.org/unsafe/assume-no-moving-gc v0.0.0-20230209150437-ee73d164e760 h1:gH0IO5GDYAcawu+ThKrvAofVTgJjYaoOZ5rrC4pS2Xw=
 go4.org/unsafe/assume-no-moving-gc v0.0.0-20230209150437-ee73d164e760/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=

From 4a3ecd0504f7e7a634b74ba8349aa66d8ca02012 Mon Sep 17 00:00:00 2001
From: Vasilev Andrew <landeleih@protonmail.com>
Date: Wed, 16 Aug 2023 15:12:59 +0200
Subject: [PATCH 2/3] missed range added

---
 api/v1alpha1/cidr_types.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/api/v1alpha1/cidr_types.go b/api/v1alpha1/cidr_types.go
index d389fee..08d7fe4 100644
--- a/api/v1alpha1/cidr_types.go
+++ b/api/v1alpha1/cidr_types.go
@@ -41,7 +41,11 @@ func CIDRFromString(cidrString string) (*CIDR, error) {
 }
 
 func CIDRFromNet(n netip.Prefix) *CIDR {
-	return &CIDR{Net: n}
+	ipRange := netipx.RangeOfPrefix(n)
+	return &CIDR{
+		Net:     n,
+		IPRange: ipRange,
+	}
 }
 
 func (in *CIDR) MarshalJSON() ([]byte, error) {

From 63a487b30460372315df0e9db9fae713c36b7c4d Mon Sep 17 00:00:00 2001
From: Vasilev Andrew <landeleih@protonmail.com>
Date: Wed, 16 Aug 2023 15:52:31 +0200
Subject: [PATCH 3/3] range calculation added

---
 api/v1alpha1/cidr_types.go | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/api/v1alpha1/cidr_types.go b/api/v1alpha1/cidr_types.go
index 08d7fe4..294453c 100644
--- a/api/v1alpha1/cidr_types.go
+++ b/api/v1alpha1/cidr_types.go
@@ -24,8 +24,7 @@ import (
 
 // +kubebuilder:validation:Type=string
 type CIDR struct {
-	Net     netip.Prefix   `json:"-"`
-	IPRange netipx.IPRange `json:"-"`
+	Net netip.Prefix `json:"-"`
 }
 
 func CIDRFromString(cidrString string) (*CIDR, error) {
@@ -33,18 +32,14 @@ func CIDRFromString(cidrString string) (*CIDR, error) {
 	if err != nil {
 		return nil, err
 	}
-	ipRange := netipx.RangeOfPrefix(cidr)
 	return &CIDR{
-		Net:     cidr,
-		IPRange: ipRange,
+		Net: cidr,
 	}, nil
 }
 
 func CIDRFromNet(n netip.Prefix) *CIDR {
-	ipRange := netipx.RangeOfPrefix(n)
 	return &CIDR{
-		Net:     n,
-		IPRange: ipRange,
+		Net: n,
 	}
 }
 
@@ -100,7 +95,8 @@ func (in *CIDR) MaskCapacity() *big.Int {
 }
 
 func (in *CIDR) ToAddressRange() (netip.Addr, netip.Addr) {
-	return in.IPRange.From(), in.IPRange.To()
+	ipRange := netipx.RangeOfPrefix(in.Net)
+	return ipRange.From(), ipRange.To()
 }
 
 func (in *CIDR) Equal(cidr *CIDR) bool {