Skip to content

pass the populated IPTables opts instead of overwriting with empty map #1269

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 1 commit into from
Mar 10, 2022
Merged

pass the populated IPTables opts instead of overwriting with empty map #1269

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
8 changes: 4 additions & 4 deletions cni/network/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,8 @@ func (plugin *NetPlugin) Add(args *cniSkel.CmdArgs) error {
if nwInfoErr != nil {
// Network does not exist.
telemetry.LogAndSendEvent(plugin.tb, fmt.Sprintf("[cni-net] Creating network %v.", networkID))
if nwInfo, err = plugin.createNetworkInternal(networkID, policies, args, nwCfg, cnsNetworkConfig, subnetPrefix, result, resultV6); err != nil {
// opts map needs to get passed in here
if nwInfo, err = plugin.createNetworkInternal(networkID, policies, args, nwCfg, cnsNetworkConfig, subnetPrefix, result, resultV6, options); err != nil {
log.Errorf("Create network failed:%w", err)
return err
}
Expand Down Expand Up @@ -588,10 +589,9 @@ func (plugin *NetPlugin) createNetworkInternal(
cnsNetworkConfig *cns.GetNetworkContainerResponse,
subnetPrefix net.IPNet,
result *cniTypesCurr.Result,
resultV6 *cniTypesCurr.Result) (network.NetworkInfo, error) {

resultV6 *cniTypesCurr.Result,
options map[string]interface{}) (network.NetworkInfo, error) {
nwInfo := network.NetworkInfo{}
options := make(map[string]interface{})
gateway := result.IPs[0].Gateway
subnetPrefix.IP = subnetPrefix.IP.Mask(subnetPrefix.Mask)
nwCfg.Ipam.Subnet = subnetPrefix.String()
Expand Down