refactoring

rancher · Feb 9, 2023 · 5bc502e · 5bc502e
1 parent c67107a
commit 5bc502e
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 23 deletions.
diff --git a/plugins/metrics/pkg/agent/drivers/embedded_manager.go b/plugins/metrics/pkg/agent/drivers/embedded_manager.go
@@ -1,9 +1,11 @@
 package drivers
 
 import (
+	"context"
 	"github.com/rancher/opni/apis"
 	"github.com/rancher/opni/pkg/test/testutil"
 	"github.com/rancher/opni/plugins/metrics/pkg/apis/node"
+	"github.com/rancher/opni/plugins/metrics/pkg/apis/remoteread"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"k8s.io/client-go/rest"
@@ -77,3 +79,7 @@ func (d *EmbeddedManagerNodeDriver) Name() string {
 func (d *EmbeddedManagerNodeDriver) ConfigureNode(_ *node.MetricsCapabilityConfig) {
 
 }
+
+func (d *EmbeddedManagerNodeDriver) DiscoverPrometheuses(ctx context.Context, namespace string) ([]*remoteread.DiscoveryEntry, error) {
+	return []*remoteread.DiscoveryEntry{}, nil
+}
diff --git a/plugins/metrics/pkg/agent/drivers/external_operator.go b/plugins/metrics/pkg/agent/drivers/external_operator.go
@@ -387,7 +387,7 @@ func (d *ExternalPromOperatorDriver) reconcileObject(desired client.Object, shou
 	return d.k8sClient.Update(context.TODO(), desired)
 }
 
-func (d *ExternalPromOperatorDriver) Discover(ctx context.Context, namespace string) ([]*remoteread.DiscoveryEntry, error) {
+func (d *ExternalPromOperatorDriver) DiscoverPrometheuses(ctx context.Context, namespace string) ([]*remoteread.DiscoveryEntry, error) {
 	list := &monitoringcoreosv1.PrometheusList{}
 	if err := d.k8sClient.List(ctx, list, client.InNamespace(namespace)); err != nil {
 		return nil, err

diff --git a/plugins/metrics/pkg/agent/drivers/node_driver.go b/plugins/metrics/pkg/agent/drivers/node_driver.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/rancher/opni/plugins/metrics/pkg/apis/remoteread"
 	"sync"
 
 	"github.com/rancher/opni/plugins/metrics/pkg/apis/node"
@@ -13,6 +14,7 @@ import (
 type MetricsNodeDriver interface {
 	Name() string
 	ConfigureNode(*node.MetricsCapabilityConfig)
+	DiscoverPrometheuses(context.Context, string) ([]*remoteread.DiscoveryEntry, error)
 }
 
 var (

diff --git a/plugins/metrics/pkg/agent/node.go b/plugins/metrics/pkg/agent/node.go
@@ -208,13 +208,7 @@ func (m *MetricsNode) Discover(ctx context.Context, request *remoteread.Discover
 		return nil, fmt.Errorf("could not get driver: %w", err)
 	}
 
-	promDriver, ok := driver.(*drivers.ExternalPromOperatorDriver)
-	if !ok {
-		m.logger.Errorf("found wrong driver type '%T'", driver)
-		return nil, fmt.Errorf("could not discover Prometheus instances")
-	}
-
-	entries, err := promDriver.Discover(ctx, *request.Namespace)
+	entries, err := driver.DiscoverPrometheuses(ctx, *request.Namespace)
 	if err != nil {
 		return nil, fmt.Errorf("could not discover Prometheus instances: %w", err)
 	}

diff --git a/plugins/metrics/pkg/apis/remoteread/remoteread.pb.go b/plugins/metrics/pkg/apis/remoteread/remoteread.pb.go
diff --git a/plugins/metrics/pkg/apis/remoteread/remoteread_grpc.pb.go b/plugins/metrics/pkg/apis/remoteread/remoteread_grpc.pb.go
diff --git a/test/plugins/metrics/import/import_test.go b/test/plugins/metrics/import/import_test.go
@@ -229,7 +229,7 @@ var _ = Describe("Remote Read Import", Ordered, Label(test.Integration, test.Slo
 
 	//When("discovering targets", func() {
 	//	It("should find all Prometheuses", func() {
-	//		entries, err := importClient.Discover(ctx, &remoteread.DiscoveryRequest{
+	//		entries, err := importClient.DiscoverPrometheuses(ctx, &remoteread.DiscoveryRequest{
 	//			ClusterIds: []string{agentId},
 	//		})
 	//		Expect(err).ToNot(HaveOccurred())
@@ -253,7 +253,7 @@ var _ = Describe("Remote Read Import", Ordered, Label(test.Integration, test.Slo
 	//		defaultNs := "default"
 	//		testNs := testNamespace
 	//
-	//		entries, err := importClient.Discover(ctx, &remoteread.DiscoveryRequest{
+	//		entries, err := importClient.DiscoverPrometheuses(ctx, &remoteread.DiscoveryRequest{
 	//			ClusterIds: []string{agentId},
 	//			Namespace:  &defaultNs,
 	//		})
@@ -266,7 +266,7 @@ var _ = Describe("Remote Read Import", Ordered, Label(test.Integration, test.Slo
 	//				InternalEndpoint: "test-prometheus.default.svc.cluster.local",
 	//			}))
 	//
-	//		entries, err = importClient.Discover(ctx, &remoteread.DiscoveryRequest{
+	//		entries, err = importClient.DiscoverPrometheuses(ctx, &remoteread.DiscoveryRequest{
 	//			ClusterIds: []string{agentId},
 	//			Namespace:  &testNs,
 	//		})