From 24074179451277594347686c47a34106ea0bed1e Mon Sep 17 00:00:00 2001 From: Anik Bhattacharjee Date: Tue, 21 Apr 2020 16:30:42 -0400 Subject: [PATCH] Bug 1826372: Tigger alert for invalid CSC This PR triggers a prometheus alert as soon as the CSC reconclier is called, instead of waiting for the CSC to reach the "Initial" phase. --- pkg/catalogsourceconfig/initial.go | 2 -- .../catalogsourceconfig/catalogsourceconfig_controller.go | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/catalogsourceconfig/initial.go b/pkg/catalogsourceconfig/initial.go index d9f5840f3..60d663b19 100644 --- a/pkg/catalogsourceconfig/initial.go +++ b/pkg/catalogsourceconfig/initial.go @@ -5,7 +5,6 @@ import ( "github.com/operator-framework/operator-marketplace/pkg/apis/operators/shared" "github.com/operator-framework/operator-marketplace/pkg/apis/operators/v2" - "github.com/operator-framework/operator-marketplace/pkg/metrics" "github.com/operator-framework/operator-marketplace/pkg/phase" "github.com/sirupsen/logrus" ) @@ -34,7 +33,6 @@ func (r *initialReconciler) Reconcile(ctx context.Context, in *v2.CatalogSourceC return } - metrics.RegisterCustomResource(metrics.ResourceTypeCSC) out = in.DeepCopy() // When a csc is created, make sure the csc finalizer is included diff --git a/pkg/controller/catalogsourceconfig/catalogsourceconfig_controller.go b/pkg/controller/catalogsourceconfig/catalogsourceconfig_controller.go index b31dcda40..b5cd53646 100644 --- a/pkg/controller/catalogsourceconfig/catalogsourceconfig_controller.go +++ b/pkg/controller/catalogsourceconfig/catalogsourceconfig_controller.go @@ -6,6 +6,7 @@ import ( v2 "github.com/operator-framework/operator-marketplace/pkg/apis/operators/v2" catalogsourceconfighandler "github.com/operator-framework/operator-marketplace/pkg/catalogsourceconfig" "github.com/operator-framework/operator-marketplace/pkg/controller/options" + "github.com/operator-framework/operator-marketplace/pkg/metrics" "github.com/operator-framework/operator-marketplace/pkg/status" "github.com/operator-framework/operator-marketplace/pkg/watches" log "github.com/sirupsen/logrus" @@ -92,6 +93,7 @@ type ReconcileCatalogSourceConfig struct { func (r *ReconcileCatalogSourceConfig) Reconcile(request reconcile.Request) (reconcile.Result, error) { log.Printf("Reconciling CatalogSourceConfig %s/%s\n", request.Namespace, request.Name) log.Warning("DEPRECATION NOTICE: The CatalogSourceConfig API is deprecated in future versions. Please visit this link for futher details: https://docs.openshift.com/container-platform/4.4/release_notes/ocp-4-4-release-notes.html#ocp-4-4-marketplace-apis-deprecated") + metrics.RegisterCustomResource(metrics.ResourceTypeCSC) // Reconcile kicked off, message Sync Channel r.syncSender.SendSyncMessage(nil)