Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1826372: Tigger alert for invalid CSC #303

Merged
merged 1 commit into from Jun 19, 2020
Merged

Bug 1826372: Tigger alert for invalid CSC #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions pkg/catalogsourceconfig/initial.go
View file
Open in desktop
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions pkg/controller/catalogsourceconfig/catalogsourceconfig_controller.go
View file
Open in desktop
Expand Up @@ -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"
Expand Down Expand Up @@ -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)

Expand Down