backport retry pool allocation after cleaning IPAM state

QxBytes · QxBytes · commit ff712e50e0ae · 2024-12-12T11:01:38.000-08:00
diff --git a/cni/network/invoker_azure.go b/cni/network/invoker_azure.go
@@ -56,6 +56,8 @@ func (invoker *AzureIPAMInvoker) Add(addConfig IPAMAddConfig) (IPAMAddResult, er
 
 	if err != nil && strings.Contains(err.Error(), ipam.ErrNoAvailableAddressPools.Error()) {
 		invoker.deleteIpamState()
+		log.Printf("Retry pool allocation after deleting IPAM state")
+		addResult.ipv4Result, err = invoker.plugin.DelegateAdd(addConfig.nwCfg.IPAM.Type, addConfig.nwCfg)
 	}
 	if err != nil {
 		err = invoker.plugin.Errorf("Failed to allocate pool: %v", err)

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,8 @@ func (invoker *AzureIPAMInvoker) Add(addConfig IPAMAddConfig) (IPAMAddResult, er`
`56`	`56`
`57`	`57`	`if err != nil && strings.Contains(err.Error(), ipam.ErrNoAvailableAddressPools.Error()) {`
`58`	`58`	`invoker.deleteIpamState()`
	`59`	`+ log.Printf("Retry pool allocation after deleting IPAM state")`
	`60`	`+ addResult.ipv4Result, err = invoker.plugin.DelegateAdd(addConfig.nwCfg.IPAM.Type, addConfig.nwCfg)`
`59`	`61`	`}`
`60`	`62`	`if err != nil {`
`61`	`63`	`err = invoker.plugin.Errorf("Failed to allocate pool: %v", err)`