Merge pull request #1172 from liqd1/bugfix/reset-subnet-releasedIPList

fix: do not reuse released ip after subnet updated

Author: hongzhen-ma

pkg/ipam/ipam.go

@@ -157,6 +157,7 @@ func (ipam *IPAM) AddOrUpdateSubnet(name, cidrStr string, excludeIps []string) e
 			lastIP, _ := util.LastIP(v4cidrStr)
 			subnet.V4FreeIPList = IPRangeList{&IPRange{Start: IP(firstIP), End: IP(lastIP)}}
 			subnet.joinFreeWithReserve()
+			subnet.V4ReleasedIPList = IPRangeList{}
 			for nicName, ip := range subnet.V4NicToIP {
 				mac := subnet.NicToMac[nicName]
 				podName := subnet.V4IPToPod[ip]
@@ -173,6 +174,7 @@ func (ipam *IPAM) AddOrUpdateSubnet(name, cidrStr string, excludeIps []string) e
 			lastIP, _ := util.LastIP(v6cidrStr)
 			subnet.V6FreeIPList = IPRangeList{&IPRange{Start: IP(firstIP), End: IP(lastIP)}}
 			subnet.joinFreeWithReserve()
+			subnet.V6ReleasedIPList = IPRangeList{}
 			for nicName, ip := range subnet.V6NicToIP {
 				mac := subnet.NicToMac[nicName]
 				podName := subnet.V6IPToPod[ip]

test/unittest/ipam/ipam.go

@@ -109,6 +109,23 @@ var _ = Describe("[IPAM]", func() {
 				Expect(err).ShouldNot(HaveOccurred())
 				Expect(ip).To(Equal("10.16.0.1"))
 			})
+
+			It("donot reuse released address after update subnet's excludedIps", func() {
+				im := ipam.NewIPAM()
+				err := im.AddOrUpdateSubnet(subnetName, "10.16.0.0/30", nil)
+				Expect(err).ShouldNot(HaveOccurred())
+
+				ip, _, _, err := im.GetRandomAddress("pod1.ns", "pod1.ns", subnetName, nil)
+				Expect(err).ShouldNot(HaveOccurred())
+				Expect(ip).To(Equal("10.16.0.1"))
+
+				im.ReleaseAddressByPod("pod1.ns")
+				err = im.AddOrUpdateSubnet(subnetName, "10.16.0.0/30", []string{"10.16.0.1..10.16.0.2"})
+				Expect(err).ShouldNot(HaveOccurred())
+
+				_, _, _, err = im.GetRandomAddress("pod1.ns", "pod1.ns", subnetName, nil)
+				Expect(err).Should(MatchError(ipam.ErrNoAvailable))
+			})
 		})
 
 		Context("[IPv6]", func() {
@@ -189,6 +206,23 @@ var _ = Describe("[IPAM]", func() {
 				Expect(err).ShouldNot(HaveOccurred())
 				Expect(ip).To(Equal("fd00::1"))
 			})
+
+			It("donot reuse released address after update subnet's excludedIps", func() {
+				im := ipam.NewIPAM()
+				err := im.AddOrUpdateSubnet(subnetName, "fd00::/126", nil)
+				Expect(err).ShouldNot(HaveOccurred())
+
+				_, ip, _, err := im.GetRandomAddress("pod1.ns", "pod1.ns", subnetName, nil)
+				Expect(err).ShouldNot(HaveOccurred())
+				Expect(ip).To(Equal("fd00::1"))
+
+				im.ReleaseAddressByPod("pod1.ns")
+				err = im.AddOrUpdateSubnet(subnetName, "fd00::/126", []string{"fd00::1..fd00::2"})
+				Expect(err).ShouldNot(HaveOccurred())
+
+				_, _, _, err = im.GetRandomAddress("pod1.ns", "pod1.ns", subnetName, nil)
+				Expect(err).Should(MatchError(ipam.ErrNoAvailable))
+			})
 		})
 
 		Context("[DualStack]", func() {
@@ -281,6 +315,24 @@ var _ = Describe("[IPAM]", func() {
 				Expect(ipv4).To(Equal("10.16.0.1"))
 				Expect(ipv6).To(Equal("fd00::1"))
 			})
+
+			It("donot reuse released address after update subnet's excludedIps", func() {
+				im := ipam.NewIPAM()
+				err := im.AddOrUpdateSubnet(subnetName, "10.16.0.2/30,fd00::/126", nil)
+				Expect(err).ShouldNot(HaveOccurred())
+
+				ipv4, ipv6, _, err := im.GetRandomAddress("pod1.ns", "pod1.ns", subnetName, nil)
+				Expect(err).ShouldNot(HaveOccurred())
+				Expect(ipv4).To(Equal("10.16.0.1"))
+				Expect(ipv6).To(Equal("fd00::1"))
+
+				im.ReleaseAddressByPod("pod1.ns")
+				err = im.AddOrUpdateSubnet(subnetName, "10.16.0.2/30,fd00::/126", []string{"10.16.0.1..10.16.0.2", "fd00::1..fd00::2"})
+				Expect(err).ShouldNot(HaveOccurred())
+
+				_, _, _, err = im.GetRandomAddress("pod1.ns", "pod1.ns", subnetName, nil)
+				Expect(err).Should(MatchError(ipam.ErrNoAvailable))
+			})
 		})
 	})