From 320987ead3a7dce1136558b1325b1baecda4d24d Mon Sep 17 00:00:00 2001 From: Ayato Tokubi Date: Wed, 29 Oct 2025 10:38:05 +0000 Subject: [PATCH] Addressed comments --- pkg/controller/resourceclaim/controller.go | 8 ++++---- pkg/controller/resourceclaim/controller_test.go | 4 ++-- pkg/controller/resourceclaim/metrics/metrics.go | 8 ++++++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkg/controller/resourceclaim/controller.go b/pkg/controller/resourceclaim/controller.go index f83a19d3be0..2d7d33e0c20 100644 --- a/pkg/controller/resourceclaim/controller.go +++ b/pkg/controller/resourceclaim/controller.go @@ -1057,14 +1057,14 @@ func (collector *customCollector) CollectWithStability(ch chan<- metrics.Metric) } rcMetrics[resourceclaimmetrics.NumResourceClaimLabels{Allocated: allocated, AdminAccess: adminAccess, Source: source}]++ } - for label, count := range rcMetrics { + for rcLabels, count := range rcMetrics { ch <- metrics.NewLazyConstMetric( resourceclaimmetrics.NumResourceClaimsDesc, metrics.GaugeValue, float64(count), - label.Allocated, - label.AdminAccess, - label.Source, + rcLabels.Allocated, + rcLabels.AdminAccess, + rcLabels.Source, ) } } diff --git a/pkg/controller/resourceclaim/controller_test.go b/pkg/controller/resourceclaim/controller_test.go index a3afc329b17..33e207effd7 100644 --- a/pkg/controller/resourceclaim/controller_test.go +++ b/pkg/controller/resourceclaim/controller_test.go @@ -1177,8 +1177,8 @@ func newNumMetrics(lister resourcelisters.ResourceClaimLister) numMetrics { } } -func (em numMetrics) withUpdates(label resourceclaimmetrics.NumResourceClaimLabels, n float64) numMetrics { - em.metrics[label] += n +func (em numMetrics) withUpdates(rcLabels resourceclaimmetrics.NumResourceClaimLabels, n float64) numMetrics { + em.metrics[rcLabels] += n return numMetrics{ metrics: em.metrics, lister: em.lister, diff --git a/pkg/controller/resourceclaim/metrics/metrics.go b/pkg/controller/resourceclaim/metrics/metrics.go index cb36ec63185..293b3f80b83 100644 --- a/pkg/controller/resourceclaim/metrics/metrics.go +++ b/pkg/controller/resourceclaim/metrics/metrics.go @@ -47,10 +47,14 @@ var ( ) // NumResourceClaimsDesc tracks the number of ResourceClaims, - // categorized by their allocation status and admin access. + // categorized by their allocation status, admin access, and source. + // Source can be 'resource_claim_template' (created from a template), + // 'extended_resource' (extended resources), or empty (manually created by a user). NumResourceClaimsDesc = metrics.NewDesc( metrics.BuildFQName("", ResourceClaimSubsystem, "resource_claims"), - "Number of ResourceClaims, categorized by allocation status and admin access", + "Number of ResourceClaims, categorized by allocation status, admin access, and source. "+ + "Source can be 'resource_claim_template' (created from a template), "+ + "'extended_resource' (extended resources), or empty (manually created by a user).", []string{"allocated", "admin_access", "source"}, nil, metrics.ALPHA, "") )