Skip to content

fix: controller panic when reloading config #6688

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.

Sign up for GitHub

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

Merged
arkodg merged 2 commits into from
Aug 4, 2025
Merged

fix: controller panic when reloading config #6688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7ff09d
fix controller panic when reloading config
zirain Aug 4, 2025
d8f70c4
release notes
zirain Aug 4, 2025
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
3 changes: 1 addition & 2 deletions internal/metrics/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,8 @@ func (r *Runner) newOptions() (registerOptions, error) {
newOpts.pullOptions.disable = true
} else {
newOpts.pullOptions.disable = false
restclient.RegisterClientMetricsWithoutRequestTotal(metricsserver.Registry)
// Workqueue metrics are already registered in controller-runtime. Use another registry.
reg := prometheus.NewRegistry()
restclient.RegisterClientMetricsWithoutRequestTotal(reg)
workqueue.RegisterMetrics(reg)
newOpts.pullOptions.registry = metricsserver.Registry
newOpts.pullOptions.gatherer = prometheus.Gatherers{
Expand Down
1 change: 1 addition & 0 deletions release-notes/current.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ new features: |
Added Gateway Listeners to the xDS listener metadata.

bug fixes: |
Fixed an issue that controller panic when reloading configuration.

# Enhancements that improve performance.
performance improvements: |
Expand Down