fix(metrics): garbage collect deleted objects

Signed-off-by: Oliver Bähler <[email protected]>

Author: oliverbaehler

internal/controllers/globalsopssecret_controller.go

@@ -138,10 +138,11 @@ func (r *GlobalSopsSecretReconciler) Reconcile(ctx context.Context, req ctrl.Req
 	log := r.Log.WithValues("Request.Name", req.Name)
 	// Fetch the Tenant instance
 	instance := &sopsv1alpha1.GlobalSopsSecret{}
+
 	if err := r.Get(ctx, req.NamespacedName, instance); err != nil {
 		if apierrors.IsNotFound(err) {
 			// Cleanup Metrics
-			r.Metrics.DeleteGlobalSecretCondition(instance)
+			r.Metrics.DeleteGlobalSecret(instance)
 			log.V(5).Info("Request object not found, could have been deleted after reconcile request")
 
 			return reconcile.Result{}, nil

internal/controllers/sopsprovider_controller.go

@@ -90,8 +90,12 @@ func (r *SopsProviderReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	log := r.Log.WithValues("Request.Name", req.Name)
 	// Fetch the Tenant instance
 	instance := &sopsv1alpha1.SopsProvider{}
+
 	if err := r.Get(ctx, req.NamespacedName, instance); err != nil {
 		if apierrors.IsNotFound(err) {
+			// Cleanup Metrics
+			r.Metrics.DeleteProvider(instance)
+
 			log.V(5).Info("Request object not found, could have been deleted after reconcile request")
 
 			return reconcile.Result{}, nil

internal/controllers/sopssecret_controller.go

@@ -106,10 +106,11 @@ func (r *SopsSecretReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	log := r.Log.WithValues("Request.Name", req.Name)
 	// Fetch the Tenant instance
 	instance := &sopsv1alpha1.SopsSecret{}
+
 	if err := r.Get(ctx, req.NamespacedName, instance); err != nil {
 		if apierrors.IsNotFound(err) {
 			// Cleanup Metrics
-			r.Metrics.DeleteSecretCondition(instance)
+			r.Metrics.DeleteSecret(instance)
 			log.V(5).Info("Request object not found, could have been deleted after reconcile request")
 
 			return reconcile.Result{}, nil

internal/metrics/recorder.go

@@ -98,20 +98,42 @@ func (r *Recorder) RecordGlobalSecretCondition(secret *sopsv1alpha1.GlobalSopsSe
 	}
 }
 
+// DeleteCondition deletes the condition metrics for the ref.
+func (r *Recorder) DeleteProvider(provider *sopsv1alpha1.SopsProvider) {
+	r.providerConditionGauge.DeletePartialMatch(map[string]string{
+		"name": provider.Name,
+	})
+}
+
 // DeleteCondition deletes the condition metrics for the ref.
 func (r *Recorder) DeleteProviderCondition(provider *sopsv1alpha1.SopsProvider) {
 	for _, status := range []string{meta.ReadyCondition, meta.NotReadyCondition} {
 		r.providerConditionGauge.DeleteLabelValues(provider.Name, status)
 	}
 }
 
+// DeleteCondition deletes the condition metrics for the ref.
+func (r *Recorder) DeleteSecret(secret *sopsv1alpha1.SopsSecret) {
+	r.secretConditionGauge.DeletePartialMatch(map[string]string{
+		"name":      secret.Name,
+		"namespace": secret.Namespace,
+	})
+}
+
 // DeleteCondition deletes the condition metrics for the ref.
 func (r *Recorder) DeleteSecretCondition(secret *sopsv1alpha1.SopsSecret) {
 	for _, status := range []string{meta.ReadyCondition, meta.NotReadyCondition} {
 		r.secretConditionGauge.DeleteLabelValues(secret.Name, secret.Namespace, status)
 	}
 }
 
+// DeleteCondition deletes the condition metrics for the ref.
+func (r *Recorder) DeleteGlobalSecret(secret *sopsv1alpha1.GlobalSopsSecret) {
+	r.globalSecretConditionGauge.DeletePartialMatch(map[string]string{
+		"name": secret.Name,
+	})
+}
+
 // DeleteCondition deletes the condition metrics for the ref.
 func (r *Recorder) DeleteGlobalSecretCondition(secret *sopsv1alpha1.GlobalSopsSecret) {
 	for _, status := range []string{meta.ReadyCondition, meta.NotReadyCondition} {