github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-09-16 07:08:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #103912 from Iceber/fix-event-recorder

Browse Source 
client-go/events: avoid referencing a nil related object

Kubernetes-commit: e7efe219f8a5fcdff9647d45639696048c1f6147
This commit is contained in:
Kubernetes Publisher
2021-08-12 02:05:47 -07:00
parent 19db02e788 3e35ef93c0
commit d6c83109f0
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@@ -30,7 +30,7 @@ require (
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
google.golang.org/protobuf v1.26.0
k8s.io/api v0.0.0-20210809160315-dea726542644
k8s.io/api v0.0.0-20210812040324-2491c6b734cf
k8s.io/apimachinery v0.0.0-20210811080139-1af25b613b64
k8s.io/klog/v2 v2.9.0
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
@@ -40,6 +40,6 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20210809160315-dea726542644
k8s.io/api => k8s.io/api v0.0.0-20210812040324-2491c6b734cf
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210811080139-1af25b613b64
)

4
go.sum
View File

@@ -599,8 +599,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210809160315-dea726542644 h1:YRfN12o4Gy+EnHsggzJqLREq5fu+9uLUY1Gqxc6qA1w=
k8s.io/api v0.0.0-20210809160315-dea726542644/go.mod h1:f1PcAK6yXpQLNV3CDbnCgD/WzlPgQy+B5Myoibc15MQ=
k8s.io/api v0.0.0-20210812040324-2491c6b734cf h1:5NV+I0ZM85RGbo2u0pP31ABu11NrURniSqJxd/HVVL8=
k8s.io/api v0.0.0-20210812040324-2491c6b734cf/go.mod h1:pV+uK+CzsU4HKxt2g6rbyKWQWvDx5/erukDsyeLigWc=
k8s.io/apimachinery v0.0.0-20210811080139-1af25b613b64 h1:nQCb3+Rke2THnETOqf9o9cAj6/hLFj7lj3KvcUp53kg=
k8s.io/apimachinery v0.0.0-20210811080139-1af25b613b64/go.mod h1:Rk+pTpcX+fNVsc3nfpy3fDaMhRjZTuFMcjsATCvV6Uk=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=

10
tools/events/event_recorder.go
View File

@@ -48,9 +48,13 @@ func (recorder *recorderImpl) Eventf(regarding runtime.Object, related runtime.O
klog.Errorf("Could not construct reference to: '%#v' due to: '%v'. Will not report event: '%v' '%v' '%v'", regarding, err, eventtype, reason, message)
return
}
refRelated, err := reference.GetReference(recorder.scheme, related)
if err != nil {
klog.V(9).Infof("Could not construct reference to: '%#v' due to: '%v'.", related, err)
var refRelated *v1.ObjectReference
if related != nil {
refRelated, err = reference.GetReference(recorder.scheme, related)
if err != nil {
klog.V(9).Infof("Could not construct reference to: '%#v' due to: '%v'.", related, err)
}
}
if !util.ValidateEventType(eventtype) {
klog.Errorf("Unsupported event type: '%v'", eventtype)