github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-08-27 20:38:47 +00:00
Code Issues Projects Releases Wiki Activity

Check Pod parameter against nil before calling Eventf

Browse Source 
Signed-off-by: Ted Yu <yuzhihong@gmail.com>
This commit is contained in:
Ted Yu 2020-04-16 19:10:30 -07:00 committed by Tomofumi Hayashi
parent f6cf49b5e5
commit c1c3193633
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
multus/multus.go
View File

@ -355,11 +355,13 @@ func delegateAdd(exec invoke.Exec, kubeClient *k8s.ClientInfo, pod *v1.Pod, ifNa
ips = append(ips, ip.Address.String()) ips = append(ips, ip.Address.String())
} }
// send kubernetes events if pod != nil {
if delegate.Name != "" { // send kubernetes events
kubeClient.Eventf(pod, v1.EventTypeNormal, "AddedInterface", "Add %s %v from %s", rt.IfName, ips, delegate.Name) if delegate.Name != "" {
} else { kubeClient.Eventf(pod, v1.EventTypeNormal, "AddedInterface", "Add %s %v from %s", rt.IfName, ips, delegate.Name)
kubeClient.Eventf(pod, v1.EventTypeNormal, "AddedInterface", "Add %s %v", rt.IfName, ips) } else {
kubeClient.Eventf(pod, v1.EventTypeNormal, "AddedInterface", "Add %s %v", rt.IfName, ips)
}
} }
return result, nil return result, nil