fixup! fixup! fixup! feature: reserve n IPs on Networks

Author: fra98

pkg/ipam/initialize.go

@@ -45,7 +45,7 @@ func (lipam *LiqoIPAM) initializeNetworks(ctx context.Context) error {
 
 	// Initialize the networks.
 	for _, net := range nets {
-		if err := lipam.reserveNetwork(&net); err != nil {
+		if err := lipam.reserveNetwork(net); err != nil {
 			klog.Errorf("Failed to reserve network %q: %v", net, err)
 			return err
 		}

pkg/ipam/ipam.go

@@ -100,14 +100,14 @@ func (lipam *LiqoIPAM) NetworkAcquire(_ context.Context, req *NetworkAcquireRequ
 
 // NetworkRelease releases a network.
 func (lipam *LiqoIPAM) NetworkRelease(_ context.Context, req *NetworkReleaseRequest) (*NetworkReleaseResponse, error) {
-	lipam.freeNetwork(&network{cidr: req.GetCidr()})
+	lipam.freeNetwork(network{cidr: req.GetCidr()})
 
 	return &NetworkReleaseResponse{}, nil
 }
 
 // NetworkIsAvailable checks if a network is available.
 func (lipam *LiqoIPAM) NetworkIsAvailable(_ context.Context, req *NetworkAvailableRequest) (*NetworkAvailableResponse, error) {
-	available := lipam.isNetworkAvailable(&network{cidr: req.GetCidr()})
+	available := lipam.isNetworkAvailable(network{cidr: req.GetCidr()})
 
 	return &NetworkAvailableResponse{Available: available}, nil
 }

pkg/ipam/networks.go

@@ -39,7 +39,7 @@ func (n network) String() string {
 }
 
 // reserveNetwork reserves a network, saving it in the cache.
-func (lipam *LiqoIPAM) reserveNetwork(nw *network) error {
+func (lipam *LiqoIPAM) reserveNetwork(nw network) error {
 	lipam.mutex.Lock()
 	defer lipam.mutex.Unlock()
 
@@ -48,7 +48,7 @@ func (lipam *LiqoIPAM) reserveNetwork(nw *network) error {
 		lipam.cacheNetworks = make(map[string]networkInfo)
 	}
 	lipam.cacheNetworks[nw.String()] = networkInfo{
-		network:           *nw,
+		network:           nw,
 		creationTimestamp: time.Now(),
 	}
 
@@ -80,7 +80,7 @@ func (lipam *LiqoIPAM) acquireNetwork(cidr string, preAllocated uint, immutable
 }
 
 // freeNetwork frees a network, removing it from the cache.
-func (lipam *LiqoIPAM) freeNetwork(nw *network) {
+func (lipam *LiqoIPAM) freeNetwork(nw network) {
 	lipam.mutex.Lock()
 	defer lipam.mutex.Unlock()
 
@@ -90,7 +90,7 @@ func (lipam *LiqoIPAM) freeNetwork(nw *network) {
 }
 
 // isNetworkAvailable checks if a network is available.
-func (lipam *LiqoIPAM) isNetworkAvailable(nw *network) bool {
+func (lipam *LiqoIPAM) isNetworkAvailable(nw network) bool {
 	lipam.mutex.Lock()
 	defer lipam.mutex.Unlock()
 

pkg/ipam/sync.go

@@ -21,7 +21,6 @@ import (
 
 	"k8s.io/apimachinery/pkg/util/wait"
 	klog "k8s.io/klog/v2"
-	"k8s.io/utils/ptr"
 )
 
 // +kubebuilder:rbac:groups=ipam.liqo.io,resources=ips,verbs=get;list;watch
@@ -65,8 +64,7 @@ func (lipam *LiqoIPAM) syncNetworks(ctx context.Context, expiredThreshold time.T
 	setClusterNetworks := make(map[string]struct{})
 
 	// Add networks that are present in the cluster but not in the cache.
-	for i := range clusterNetworks {
-		net := &clusterNetworks[i]
+	for _, net := range clusterNetworks {
 		if _, inCache := lipam.cacheNetworks[net.String()]; !inCache {
 			if err := lipam.reserveNetwork(net); err != nil {
 				return err
@@ -78,7 +76,7 @@ func (lipam *LiqoIPAM) syncNetworks(ctx context.Context, expiredThreshold time.T
 	// Remove networks that are present in the cache but not in the cluster, and were added before the threshold.
 	for key := range lipam.cacheNetworks {
 		if _, inCluster := setClusterNetworks[key]; !inCluster && lipam.cacheNetworks[key].creationTimestamp.Before(expiredThreshold) {
-			lipam.freeNetwork(ptr.To(lipam.cacheNetworks[key].network))
+			lipam.freeNetwork(lipam.cacheNetworks[key].network)
 		}
 	}