Skip to content

[WIP] Use cacheed CNI config in pod deletion #52

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

Closed
wants to merge 1 commit into from
Closed

[WIP] Use cacheed CNI config in pod deletion #52

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions pkg/ocicni/ocicni.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,22 @@ func (network *cniNetwork) deleteFromNetwork(cacheDir string, podNetwork *PodNet
}

netconf, cninet := network.NetworkConfig, network.CNIConfig

// use cache if exist
cachedBytes, cachedRuntime, err := cninet.GetNetworkListCachedConfig(network.NetworkConfig, rt)
if err == nil {
cachedNetworkConfigList, err := libcni.ConfListFromBytes(cachedBytes)
if err == nil {
logrus.Infof("About to del CNI network %s with cahce (type=%v)", netconf.Name, netconf.Plugins[0].Network.Type)
err = cninet.DelNetworkList(context.Background(), cachedNetworkConfigList, cachedRuntime)
if err != nil {
logrus.Errorf("Error deleting network with cache: %v", err)
return err
}
return nil
}
}

logrus.Infof("About to del CNI network %s (type=%v)", netconf.Name, netconf.Plugins[0].Network.Type)
err = cninet.DelNetworkList(context.Background(), netconf, rt)
if err != nil {
Expand Down