Skip to content

Commit

Permalink
Merge pull request k8snetworkplumbingwg#131 from dougbtv/downstream-d…
Browse files Browse the repository at this point in the history
…eviceinfo-fix

Bug 2092839: Fix missing device-info in networks-status annotation for chained plugins
  • Loading branch information
openshift-ci[bot] authored Jun 22, 2022
2 parents 3dea9d5 + a4a36c6 commit 3cc5a3a
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions pkg/types/conf.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ func LoadDelegateNetConf(bytes []byte, net *NetworkSelectionElement, deviceID st
if err != nil {
return nil, logging.Errorf("LoadDelegateNetConf: failed to add deviceID in NetConfList bytes: %v", err)
}
delegateConf.ResourceName = resourceName
delegateConf.DeviceID = deviceID
}
if net != nil && net.CNIArgs != nil {
bytes, err = addCNIArgsInConfList(bytes, net.CNIArgs)
Expand Down

0 comments on commit 3cc5a3a

Please sign in to comment.