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

fix(metrics): use CRD client instead of k8s #515

Merged
merged 1 commit into from
Oct 16, 2018
Merged

fix(metrics): use CRD client instead of k8s #515

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/controller/operators/catalog/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func NewOperator(kubeconfigPath string, wakeupInterval time.Duration, operatorNa
op.syncCatalogSources,
nil,
"catsrc",
metrics.NewMetricsCatalogSource(op.Operator.OpClient),
metrics.NewMetricsCatalogSource(op.client),
)
for _, informer := range catsrcQueueInformer {
op.RegisterQueueInformer(informer)
Expand All @@ -120,7 +120,7 @@ func NewOperator(kubeconfigPath string, wakeupInterval time.Duration, operatorNa
op.syncInstallPlans,
nil,
"installplan",
metrics.NewMetricsInstallPlan(op.Operator.OpClient),
metrics.NewMetricsInstallPlan(op.client),
)
for _, informer := range ipQueueInformers {
op.RegisterQueueInformer(informer)
Expand All @@ -134,7 +134,7 @@ func NewOperator(kubeconfigPath string, wakeupInterval time.Duration, operatorNa
op.syncSubscriptions,
nil,
"subscription",
metrics.NewMetricsSubscription(op.Operator.OpClient),
metrics.NewMetricsSubscription(op.client),
)
op.subQueue = subscriptionQueue
for _, informer := range subscriptionQueueInformers {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/operators/olm/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ func NewOperator(crClient versioned.Interface, opClient operatorclient.ClientInt
op.syncClusterServiceVersion,
nil,
"csv",
metrics.NewMetricsCSV(op.Operator.OpClient),
metrics.NewMetricsCSV(op.client),
)
for _, informer := range queueInformers {
op.RegisterQueueInformer(informer)
Expand Down
35 changes: 17 additions & 18 deletions pkg/metrics/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package metrics

import (
"github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient"
"github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned"
"github.com/prometheus/client_golang/prometheus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand All @@ -12,15 +11,15 @@ type MetricsProvider interface {
}

type metricsCSV struct {
opClient operatorclient.ClientInterface
client versioned.Interface
}

func NewMetricsCSV(opClient operatorclient.ClientInterface) MetricsProvider {
return &metricsCSV{opClient}
func NewMetricsCSV(client versioned.Interface) MetricsProvider {
return &metricsCSV{client}
}

func (m *metricsCSV) HandleMetrics() error {
cList, err := m.opClient.ListCustomResource(v1alpha1.GroupName, v1alpha1.GroupVersion, metav1.NamespaceAll, v1alpha1.ClusterServiceVersionKind)
cList, err := m.client.OperatorsV1alpha1().ClusterServiceVersions(metav1.NamespaceAll).List(metav1.ListOptions{})
if err != nil {
return err
}
Expand All @@ -29,15 +28,15 @@ func (m *metricsCSV) HandleMetrics() error {
}

type metricsInstallPlan struct {
opClient operatorclient.ClientInterface
client versioned.Interface
}

func NewMetricsInstallPlan(opClient operatorclient.ClientInterface) MetricsProvider {
return &metricsInstallPlan{opClient}
func NewMetricsInstallPlan(client versioned.Interface) MetricsProvider {
return &metricsInstallPlan{client}
}

func (m *metricsInstallPlan) HandleMetrics() error {
cList, err := m.opClient.ListCustomResource(v1alpha1.GroupName, v1alpha1.GroupVersion, metav1.NamespaceAll, v1alpha1.InstallPlanKind)
cList, err := m.client.OperatorsV1alpha1().InstallPlans(metav1.NamespaceAll).List(metav1.ListOptions{})
if err != nil {
return err
}
Expand All @@ -46,15 +45,15 @@ func (m *metricsInstallPlan) HandleMetrics() error {
}

type metricsSubscription struct {
opClient operatorclient.ClientInterface
client versioned.Interface
}

func NewMetricsSubscription(opClient operatorclient.ClientInterface) MetricsProvider {
return &metricsSubscription{opClient}
func NewMetricsSubscription(client versioned.Interface) MetricsProvider {
return &metricsSubscription{client}
}

func (m *metricsSubscription) HandleMetrics() error {
cList, err := m.opClient.ListCustomResource(v1alpha1.GroupName, v1alpha1.GroupVersion, metav1.NamespaceAll, v1alpha1.SubscriptionKind)
cList, err := m.client.OperatorsV1alpha1().Subscriptions(metav1.NamespaceAll).List(metav1.ListOptions{})
if err != nil {
return err
}
Expand All @@ -63,16 +62,16 @@ func (m *metricsSubscription) HandleMetrics() error {
}

type metricsCatalogSource struct {
opClient operatorclient.ClientInterface
client versioned.Interface
}

func NewMetricsCatalogSource(opClient operatorclient.ClientInterface) MetricsProvider {
return &metricsCatalogSource{opClient}
func NewMetricsCatalogSource(client versioned.Interface) MetricsProvider {
return &metricsCatalogSource{client}

}

func (m *metricsCatalogSource) HandleMetrics() error {
cList, err := m.opClient.ListCustomResource(v1alpha1.GroupName, v1alpha1.GroupVersion, metav1.NamespaceAll, v1alpha1.CatalogSourceKind)
cList, err := m.client.OperatorsV1alpha1().CatalogSources(metav1.NamespaceAll).List(metav1.ListOptions{})
if err != nil {
return err
}
Expand Down