rancher/multus-cni
1
0
Fork 0
forked from github/multus-cni
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #867 from mmirecki/downwardapi

Browse Source 
Fix missing device-info in networks-status annotation for chained plugins
This commit is contained in:
Doug Smith 2022-06-21 14:38:29 -04:00 committed by GitHub
commit 18a660ebc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/types/conf.go
View File

@ -80,6 +80,8 @@ func LoadDelegateNetConf(bytes []byte, net *NetworkSelectionElement, deviceID st
if err != nil { if err != nil {
return nil, logging.Errorf("LoadDelegateNetConf: failed to add deviceID in NetConfList bytes: %v", err) 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 { if net != nil && net.CNIArgs != nil {
bytes, err = addCNIArgsInConfList(bytes, net.CNIArgs) bytes, err = addCNIArgsInConfList(bytes, net.CNIArgs)