ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Merge pull request #590 from thxCode/fix_win_bridge_hnsadd_panic

Browse Source 
win-bridge: fix panic while calling HNS api
This commit is contained in:
Dan Williams 2021-03-03 08:48:43 -06:00 committed by GitHub
commit 0ea07b8269
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/main/windows/win-bridge/win-bridge_windows.go
View File

@ -112,10 +112,11 @@ func cmdHnsAdd(args *skel.CmdArgs, n *NetConf) (*current.Result, error) {
epName := hns.ConstructEndpointName(args.ContainerID, args.Netns, n.Name) epName := hns.ConstructEndpointName(args.ContainerID, args.Netns, n.Name)
hnsEndpoint, err := hns.ProvisionEndpoint(epName, hnsNetwork.Id, args.ContainerID, args.Netns, func() (*hcsshim.HNSEndpoint, error) { hnsEndpoint, err := hns.ProvisionEndpoint(epName, hnsNetwork.Id, args.ContainerID, args.Netns, func() (*hcsshim.HNSEndpoint, error) {
epInfo, err := ProcessEndpointArgs(args, n) epInfo, err := ProcessEndpointArgs(args, n)
epInfo.NetworkId = hnsNetwork.Id
if err != nil { if err != nil {
return nil, errors.Annotatef(err, "error while ProcessEndpointArgs") return nil, errors.Annotatef(err, "error while ProcessEndpointArgs")
} }
epInfo.NetworkId = hnsNetwork.Id
hnsEndpoint, err := hns.GenerateHnsEndpoint(epInfo, &n.NetConf) hnsEndpoint, err := hns.GenerateHnsEndpoint(epInfo, &n.NetConf)
if err != nil { if err != nil {
return nil, errors.Annotatef(err, "error while GenerateHnsEndpoint") return nil, errors.Annotatef(err, "error while GenerateHnsEndpoint")