Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix unchecked cast panic in traffic-manager pod watcher. #3153

Merged
merged 1 commit into from
Apr 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

### 2.13.2 (TBD)

- Bugfix: The traffic-manager would sometimes panic and exit after some time due to a type cast panic.

### 2.13.1 (April 20, 2023)

- Change: Update ambassador-agent to version 1.13.13

### 2.13.0 (April 18, 2023)

- Feature: The Docker network used by a Kind or Minikube (using the "docker" driver) installation, is automatically
Expand Down
18 changes: 15 additions & 3 deletions cmd/traffic/cmd/manager/internal/cluster/nodewatcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,25 @@ func newNodeWatcher(ctx context.Context, lister licorev1.NodeLister, informer ca
}
_, err := informer.AddEventHandler(cache.ResourceEventHandlerFuncs{
AddFunc: func(obj any) {
w.onNodeAdded(ctx, obj.(*corev1.Node))
if node, ok := obj.(*corev1.Node); ok {
w.onNodeAdded(ctx, node)
}
},
DeleteFunc: func(obj any) {
w.onNodeDeleted(ctx, obj.(*corev1.Node))
if node, ok := obj.(*corev1.Node); ok {
w.onNodeDeleted(ctx, node)
} else if dfsu, ok := obj.(*cache.DeletedFinalStateUnknown); ok {
if node, ok := dfsu.Obj.(*corev1.Node); ok {
w.onNodeDeleted(ctx, node)
}
}
},
UpdateFunc: func(oldObj, newObj any) {
w.onNodeUpdated(ctx, oldObj.(*corev1.Node), newObj.(*corev1.Node))
if oldNode, ok := oldObj.(*corev1.Node); ok {
if newNode, ok := newObj.(*corev1.Node); ok {
w.onNodeUpdated(ctx, oldNode, newNode)
}
}
},
})
if err != nil {
Expand Down
18 changes: 15 additions & 3 deletions cmd/traffic/cmd/manager/internal/cluster/podwatcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,25 @@ func newPodWatcher(ctx context.Context, listers []PodLister, informers []cache.S
for _, informer := range informers {
_, err := informer.AddEventHandler(cache.ResourceEventHandlerFuncs{
AddFunc: func(obj any) {
w.onPodAdded(ctx, obj.(*corev1.Pod))
if pod, ok := obj.(*corev1.Pod); ok {
w.onPodAdded(ctx, pod)
}
},
DeleteFunc: func(obj any) {
w.onPodDeleted(ctx, obj.(*corev1.Pod))
if pod, ok := obj.(*corev1.Pod); ok {
w.onPodDeleted(ctx, pod)
} else if dfsu, ok := obj.(*cache.DeletedFinalStateUnknown); ok {
if pod, ok := dfsu.Obj.(*corev1.Pod); ok {
w.onPodDeleted(ctx, pod)
}
}
},
UpdateFunc: func(oldObj, newObj any) {
w.onPodUpdated(ctx, oldObj.(*corev1.Pod), newObj.(*corev1.Pod))
if oldPod, ok := oldObj.(*corev1.Pod); ok {
if newPod, ok := newObj.(*corev1.Pod); ok {
w.onPodUpdated(ctx, oldPod, newPod)
}
}
},
})
if err != nil {
Expand Down