Skip to content

Commit ef40c89

Browse files
authored
[receiver/k8seventsreceiver] avoid panic on non-Event objects in informer handler (#43018)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description As discussed in the following [thread](#42330 (comment)), I decided to open a dedicated PR for this. The change just makes the code safer, as before we were assuming the object was always an Event, which could panic if it wasn’t. Now we check first, and skip anything that isn’t an Event. Signed-off-by: Paulo Dias <[email protected]>
1 parent b1b09b4 commit ef40c89

File tree

2 files changed

+33
-4
lines changed

2 files changed

+33
-4
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: "bug_fix"
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: "receiver/k8seventsreceiver"
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: "Prevent potential panic in the events receiver by safely checking that informer objects are *corev1.Event before handling them."
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [43014]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]

receiver/k8seventsreceiver/receiver.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,14 @@ func (kr *k8seventsReceiver) startWatch(ns string, client k8s.Interface) {
150150
kr.stopperChanList = append(kr.stopperChanList, stopperChan)
151151
kr.startWatchingNamespace(client, cache.ResourceEventHandlerFuncs{
152152
AddFunc: func(obj any) {
153-
ev := obj.(*corev1.Event)
154-
kr.handleEvent(ev)
153+
if ev, ok := obj.(*corev1.Event); ok {
154+
kr.handleEvent(ev)
155+
}
155156
},
156157
UpdateFunc: func(_, obj any) {
157-
ev := obj.(*corev1.Event)
158-
kr.handleEvent(ev)
158+
if ev, ok := obj.(*corev1.Event); ok {
159+
kr.handleEvent(ev)
160+
}
159161
},
160162
}, ns, stopperChan)
161163
}

0 commit comments

Comments
 (0)