fixup! feat: ipam sync routine

pkg/ipam/ips.go

@@ -41,24 +41,21 @@ func (i *ipCidr) String() string {
 	return i.ip + "-" + i.cidr
 }
 
+// reserveIP reserves an IP, saving it in the cache.
 func (lipam *LiqoIPAM) reserveIP(ip, cidr string) error {
 	lipam.mutex.Lock()
 	defer lipam.mutex.Unlock()
 
-	if lipam.cacheIPs == nil {
-		lipam.cacheIPs = make(map[string]ipInfo)
-	}
-
-	// TODO: add correct logic.
 	ipI := ipInfo{
 		ipCidr:            ipCidr{ip: ip, cidr: cidr},
 		creationTimestamp: time.Now(),
 	}
-
-	// Save IP in cache.
+	if lipam.cacheIPs == nil {
+		lipam.cacheIPs = make(map[string]ipInfo)
+	}
 	lipam.cacheIPs[ipI.String()] = ipI
-	klog.Infof("Reserved IP %s in network %s", ip, cidr)
 
+	klog.Infof("Reserved IP %s in network %s", ip, cidr)
 	return nil
 }
 

pkg/ipam/networks.go

@@ -33,24 +33,21 @@ func (c *networkInfo) String() string {
 	return c.cidr
 }
 
+// reserveNetwork reserves a network, saving it in the cache.
 func (lipam *LiqoIPAM) reserveNetwork(cidr string) error {
 	lipam.mutex.Lock()
 	defer lipam.mutex.Unlock()
 
-	if lipam.cacheNetworks == nil {
-		lipam.cacheNetworks = make(map[string]networkInfo)
-	}
-
-	// TODO: add correct logic
 	nwI := networkInfo{
 		cidr:              cidr,
 		creationTimestamp: time.Now(),
 	}
-
-	// Save network in cache.
+	if lipam.cacheNetworks == nil {
+		lipam.cacheNetworks = make(map[string]networkInfo)
+	}
 	lipam.cacheNetworks[nwI.String()] = nwI
-	klog.Infof("Reserved network %s", cidr)
 
+	klog.Infof("Reserved network %s", cidr)
 	return nil
 }
 

pkg/ipam/sync.go

@@ -68,7 +68,7 @@ func (lipam *LiqoIPAM) syncNetworks(ctx context.Context, expiredThreshold time.T
 		nwSet[nwI.String()] = struct{}{}
 	}
 
-	// Remove networks that are not present in the cache and were added before the threshold.
+	// 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 _, ok := nwSet[key]; !ok && lipam.cacheNetworks[key].creationTimestamp.Before(expiredThreshold) {
 			delete(lipam.cacheNetworks, key)
@@ -93,7 +93,7 @@ func (lipam *LiqoIPAM) syncIPs(ctx context.Context, expiredThreshold time.Time)
 		ipSet[ipI.String()] = struct{}{}
 	}
 
-	// Remove IPs that are not present in the cache and were added before the threshold.
+	// Remove IPs that are present in the cache but not in the cluster, and were added before the threshold.
 	for key := range lipam.cacheIPs {
 		if _, ok := ipSet[key]; !ok && lipam.cacheIPs[key].creationTimestamp.Before(expiredThreshold) {
 			delete(lipam.cacheIPs, key)