coreos/prometheus-operator
1
0
Fork 0
mirror of https://github.com/coreos/prometheus-operator.git synced 2026-02-05 06:45:27 +01:00
Code Issues Releases Wiki Activity

fix: add nil check for sconInfs before ScrapeConfig cleanup (#8287)

Browse Source 
Prevents nil pointer dereference when config resource status feature
is enabled but ScrapeConfig CRD support is unavailable.

Signed-off-by: Sanchit2662 <sanchit2662@gmail.com>
This commit is contained in:
Simon Pasquier
2026-01-16 16:50:07 +01:00
committed by GitHub
parent d7b73f4c26 10186ec9ba
commit ebd560c05c
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/prometheus/server/operator.go
View File

@@ -1116,8 +1116,11 @@ func (c *Operator) updateConfigResourcesStatus(ctx context.Context, p *monitorin
// Remove bindings from scrapeConfigs which reference the
// workload but aren't selected anymore.
if err := operator.CleanupBindings(ctx, c.sconInfs.ListAll, resources.scrapeConfigs, configResourceSyncer); err != nil {
return fmt.Errorf("failed to remove bindings for scrapeConfigs: %w", err)
// Only cleanup if ScrapeConfig support is enabled (sconInfs is initialized).
if c.sconInfs != nil {
if err := operator.CleanupBindings(ctx, c.sconInfs.ListAll, resources.scrapeConfigs, configResourceSyncer); err != nil {
return fmt.Errorf("failed to remove bindings for scrapeConfigs: %w", err)
}
}
// Remove bindings from probes which reference the
@@ -1153,8 +1156,11 @@ func (c *Operator) configResStatusCleanup(ctx context.Context, p *monitoringv1.P
}
// Remove bindings from all scrapeConfigs which reference the workload.
if err := operator.CleanupBindings(ctx, c.sconInfs.ListAll, operator.TypedResourcesSelection[*monitoringv1alpha1.ScrapeConfig]{}, configResourceSyncer); err != nil {
return fmt.Errorf("failed to remove bindings for scrapeConfigs: %w", err)
// Only cleanup if ScrapeConfig support is enabled (sconInfs is initialized).
if c.sconInfs != nil {
if err := operator.CleanupBindings(ctx, c.sconInfs.ListAll, operator.TypedResourcesSelection[*monitoringv1alpha1.ScrapeConfig]{}, configResourceSyncer); err != nil {
return fmt.Errorf("failed to remove bindings for scrapeConfigs: %w", err)
}
}
// Remove bindings from all probes which reference the workload.