Skip to content

fix: save cni state only during endpoint creation or deletion #3254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 13, 2024
Merged

fix: save cni state only during endpoint creation or deletion #3254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e32dbf7
save only during endpoint creation or deletion
QxBytes Dec 11, 2024
f80b17d
backport retry pool allocation after cleaning IPAM state
QxBytes Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cni/network/invoker_azure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 0 additions & 10 deletions network/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,6 @@ func (nm *networkManager) AddExternalInterface(ifName string, subnet string) err
return err
}

err = nm.save()
if err != nil {
return err
}

return nil
}

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

err = nm.save()
if err != nil {
return err
}

return nil
}

Expand Down
Loading