Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nokia/danm
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 52827444ac286bccda591edf53473f3ad647d5a5
Choose a base ref
..
head repository: nokia/danm
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7102a16f0100f89baef74a9460c8c5197215b30b
Choose a head ref
Showing with 1 addition and 5 deletions.
  1. +1 −5 pkg/cnidel/cnidel.go
6 changes: 1 addition & 5 deletions pkg/cnidel/cnidel.go
Original file line number Diff line number Diff line change
@@ -163,11 +163,7 @@ func getExecCniParams(cniType string, netInfo *danmtypes.DanmNet, ep *danmtypes.
"CNI_IFNAME=" + ep.Spec.Iface.Name,
"CNI_ARGS=" + os.Getenv("CNI_ARGS"),
"CNI_PATH=" + os.Getenv("CNI_PATH"),
}
if cniType == "weave-net" {
cniArgs = append([]string{
"PATH=" + os.Getenv("PATH"),
}, cniArgs...)
"PATH=" + os.Getenv("PATH"),
}
return cniPath, cniArgs, nil
}