github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-08-25 03:22:00 +00:00
Code Issues Projects Releases Wiki Activity

Remove unnecessary else clause

Browse Source
This commit is contained in:
Tomofumi Hayashi 2018-10-26 14:47:59 +09:00 committed by dougbtv
parent 87b7dbc378
commit dd9fedee2a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
types/conf.go
View File

@ -52,18 +52,19 @@ func LoadDelegateNetConfList(bytes []byte, delegateConf *DelegateNetConf) error
// Convert raw CNI JSON into a DelegateNetConf structure // Convert raw CNI JSON into a DelegateNetConf structure
func LoadDelegateNetConf(bytes []byte, net *NetworkSelectionElement, deviceID string) (*DelegateNetConf, error) { func LoadDelegateNetConf(bytes []byte, net *NetworkSelectionElement, deviceID string) (*DelegateNetConf, error) {
delegateConf := &DelegateNetConf{} var err error
logging.Debugf("LoadDelegateNetConf: %s, %v", string(bytes), net) logging.Debugf("LoadDelegateNetConf: %s, %v, %s", string(bytes), net, deviceID)
// If deviceID is present, inject this into delegate config // If deviceID is present, inject this into delegate config
if deviceID != "" { if deviceID != "" {
if updatedBytes, err := delegateAddDeviceID(bytes, deviceID); err != nil { var updatedBytes []byte
if updatedBytes, err = delegateAddDeviceID(bytes, deviceID); err != nil {
return nil, logging.Errorf("error in LoadDelegateNetConf - delegateAddDeviceID unable to update delegate config: %v", err) return nil, logging.Errorf("error in LoadDelegateNetConf - delegateAddDeviceID unable to update delegate config: %v", err)
} else {
bytes = updatedBytes
} }
bytes = updatedBytes
} }
delegateConf := &DelegateNetConf{}
if err := json.Unmarshal(bytes, &delegateConf.Conf); err != nil { if err := json.Unmarshal(bytes, &delegateConf.Conf); err != nil {
return nil, logging.Errorf("error in LoadDelegateNetConf - unmarshalling delegate config: %v", err) return nil, logging.Errorf("error in LoadDelegateNetConf - unmarshalling delegate config: %v", err)
} }