Skip to content

Commit 447f655

Browse files
authored
fix: save cni state only during endpoint creation or deletion (#3254)
* save only during endpoint creation or deletion * backport retry pool allocation after cleaning IPAM state
1 parent 8e70c85 commit 447f655

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

cni/network/invoker_azure.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ func (invoker *AzureIPAMInvoker) Add(addConfig IPAMAddConfig) (IPAMAddResult, er
5656

5757
if err != nil && strings.Contains(err.Error(), ipam.ErrNoAvailableAddressPools.Error()) {
5858
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)
5961
}
6062
if err != nil {
6163
err = invoker.plugin.Errorf("Failed to allocate pool: %v", err)

network/manager.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -250,11 +250,6 @@ func (nm *networkManager) AddExternalInterface(ifName string, subnet string) err
250250
return err
251251
}
252252

253-
err = nm.save()
254-
if err != nil {
255-
return err
256-
}
257-
258253
return nil
259254
}
260255

@@ -268,11 +263,6 @@ func (nm *networkManager) CreateNetwork(nwInfo *NetworkInfo) error {
268263
return err
269264
}
270265

271-
err = nm.save()
272-
if err != nil {
273-
return err
274-
}
275-
276266
return nil
277267
}
278268

0 commit comments

Comments
 (0)