Skip to content

Commit 6b6f1d4

Browse files
committed
Delete stale metrics on object delete
The metrics helper now accepts owned finalizers to determine if an object is no longer managed by the controller and is being deleted, and deletes the metrics associated with the object. Signed-off-by: Sunny <darkowlzz@protonmail.com>
1 parent 4c1ea27 commit 6b6f1d4

4 files changed

Lines changed: 7 additions & 5 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
github.com/fluxcd/pkg/apis/meta v1.1.2
3131
github.com/fluxcd/pkg/http/fetch v0.5.2
3232
github.com/fluxcd/pkg/kustomize v1.3.4
33-
github.com/fluxcd/pkg/runtime v0.41.0
33+
github.com/fluxcd/pkg/runtime v0.42.0
3434
github.com/fluxcd/pkg/ssa v0.30.0
3535
github.com/fluxcd/pkg/tar v0.2.0
3636
github.com/fluxcd/pkg/testserver v0.4.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ github.com/fluxcd/pkg/http/fetch v0.5.2 h1:0yJPGnjBUFiU3be/5a0IwAcSR29RvGwbsCU4z
192192
github.com/fluxcd/pkg/http/fetch v0.5.2/go.mod h1:GV8ghKmWY54q0qYHe/erJffe5XlkjSReQV4Bog0rj8w=
193193
github.com/fluxcd/pkg/kustomize v1.3.4 h1:+XA4umfhkFqrNYQp3ZmKSJy4i3LWjbgoi6H4PllkkkA=
194194
github.com/fluxcd/pkg/kustomize v1.3.4/go.mod h1:nsbsNGe6nQY6DGYYPowFGQlhxFRcaRFvbwqhCbwAQuE=
195-
github.com/fluxcd/pkg/runtime v0.41.0 h1:hjWUwVRCKDuGEUhovWrygt/6PRry4p278yKuJNgTfv8=
196-
github.com/fluxcd/pkg/runtime v0.41.0/go.mod h1:1GN+nxoQ7LmSsLJwjH8JW8pA27tBSO+KLH43HpywCDM=
195+
github.com/fluxcd/pkg/runtime v0.42.0 h1:a5DQ/f90YjoHBmiXZUpnp4bDSLORjInbmqP7K11L4uY=
196+
github.com/fluxcd/pkg/runtime v0.42.0/go.mod h1:p6A3xWVV8cKLLQW0N90GehKgGMMmbNYv+OSJ/0qB0vg=
197197
github.com/fluxcd/pkg/sourceignore v0.3.4 h1:0cfS2Pj7xp2qpaerMjYqOBr82LC+/mGHl6v6pRbi5hs=
198198
github.com/fluxcd/pkg/sourceignore v0.3.4/go.mod h1:ejLx+/uIrPUgqVzMTR5JiWuUnzs+zTkoEf9gS92LqaE=
199199
github.com/fluxcd/pkg/ssa v0.30.0 h1:SYf8EBXevbTNwdHoKqRuU00YdnmqqUuR5xcciRrIi0E=

internal/controller/suite_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import (
4343
"github.com/fluxcd/pkg/runtime/conditions"
4444
kcheck "github.com/fluxcd/pkg/runtime/conditions/check"
4545
"github.com/fluxcd/pkg/runtime/controller"
46+
"github.com/fluxcd/pkg/runtime/metrics"
4647
"github.com/fluxcd/pkg/runtime/testenv"
4748
"github.com/fluxcd/pkg/testserver"
4849
sourcev1 "github.com/fluxcd/source-controller/api/v1"
@@ -160,7 +161,7 @@ func runInContext(registerControllers func(*testenv.Environment), run func() int
160161
func TestMain(m *testing.M) {
161162
code := runInContext(func(testEnv *testenv.Environment) {
162163
controllerName := "kustomize-controller"
163-
testMetricsH = controller.MustMakeMetrics(testEnv)
164+
testMetricsH = controller.NewMetrics(testEnv, metrics.MustMakeRecorder(), kustomizev1.KustomizationFinalizer)
164165
kstatusCheck = kcheck.NewChecker(testEnv.Client,
165166
&kcheck.Conditions{
166167
NegativePolarity: []string{meta.StalledCondition, meta.ReconcilingCondition},

main.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import (
4444
"github.com/fluxcd/pkg/runtime/jitter"
4545
"github.com/fluxcd/pkg/runtime/leaderelection"
4646
"github.com/fluxcd/pkg/runtime/logger"
47+
"github.com/fluxcd/pkg/runtime/metrics"
4748
"github.com/fluxcd/pkg/runtime/pprof"
4849
"github.com/fluxcd/pkg/runtime/probes"
4950
sourcev1 "github.com/fluxcd/source-controller/api/v1"
@@ -197,7 +198,7 @@ func main() {
197198
os.Exit(1)
198199
}
199200

200-
metricsH := runtimeCtrl.MustMakeMetrics(mgr)
201+
metricsH := runtimeCtrl.NewMetrics(mgr, metrics.MustMakeRecorder(), kustomizev1.KustomizationFinalizer)
201202

202203
jobStatusReader := statusreaders.NewCustomJobStatusReader(mgr.GetRESTMapper())
203204
pollingOpts := polling.Options{

0 commit comments

Comments
 (0)