K8s: Use wire to initalize the resource client (#93221)

pkg/services/apiserver/options/storage.go

@@ -4,12 +4,11 @@ import (
 	"fmt"
 	"net"
 
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/setting"
 	"github.com/spf13/pflag"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	"k8s.io/apiserver/pkg/server/options"
-
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/setting"
 )
 
 type StorageType string
@@ -22,11 +21,19 @@ const (
 	StorageTypeUnifiedGrpc StorageType = "unified-grpc"
 )
 
-type StorageOptions struct {
-	StorageType                  StorageType
-	DataPath                     string
-	Address                      string
-	UnifiedStorageConfig         map[string]setting.UnifiedStorageConfig
+type StorageOptions struct { // The desired storage type
+	StorageType StorageType
+
+	// For unified-grpc, the address is required
+	Address string
+
+	// For file storage, this is the requested path
+	DataPath string
+
+	// {resource}.{group} = 1|2|3|4
+	UnifiedStorageConfig map[string]setting.UnifiedStorageConfig
+
+	// TODO... this will be moved to UnifiedStorageConfig
 	DualWriterDataSyncJobEnabled map[string]bool
 }
 

pkg/services/apiserver/service.go

@@ -8,20 +8,6 @@ import (
 
 	"github.com/grafana/dskit/services"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/prometheus/client_golang/prometheus"
-	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/runtime/serializer"
-	"k8s.io/apiserver/pkg/endpoints/responsewriter"
-	genericapiserver "k8s.io/apiserver/pkg/server"
-	clientrest "k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/clientcmd"
-	aggregatorapiserver "k8s.io/kube-aggregator/pkg/apiserver"
-
 	dataplaneaggregator "github.com/grafana/grafana/pkg/aggregator/apiserver"
 	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/apimachinery/identity"
@@ -50,7 +36,16 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/storage/unified/apistore"
 	"github.com/grafana/grafana/pkg/storage/unified/resource"
-	"github.com/grafana/grafana/pkg/storage/unified/sql"
+	"github.com/prometheus/client_golang/prometheus"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/apiserver/pkg/endpoints/responsewriter"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	clientrest "k8s.io/client-go/rest"
+	"k8s.io/client-go/tools/clientcmd"
+	aggregatorapiserver "k8s.io/kube-aggregator/pkg/apiserver"
 )
 
 var (
@@ -128,6 +123,7 @@ type service struct {
 	datasources     datasource.ScopedPluginDatasourceProvider
 	contextProvider datasource.PluginContextWrapper
 	pluginStore     pluginstore.Store
+	unified         resource.ResourceClient
 }
 
 func ProvideService(
@@ -143,6 +139,7 @@ func ProvideService(
 	datasources datasource.ScopedPluginDatasourceProvider,
 	contextProvider datasource.PluginContextWrapper,
 	pluginStore pluginstore.Store,
+	unified resource.ResourceClient,
 ) (*service, error) {
 	s := &service{
 		cfg:               cfg,
@@ -161,6 +158,7 @@ func ProvideService(
 		contextProvider:   contextProvider,
 		pluginStore:       pluginStore,
 		serverLockService: serverLockService,
+		unified:           unified,
 	}
 
 	// This will be used when running as a dskit service
@@ -284,47 +282,17 @@ func (s *service) start(ctx context.Context) error {
 	serverConfig.LoopbackClientConfig.Transport = transport
 	serverConfig.LoopbackClientConfig.TLSClientConfig = clientrest.TLSClientConfig{}
 
-	switch o.StorageOptions.StorageType {
-	case grafanaapiserveroptions.StorageTypeEtcd:
+	if o.StorageOptions.StorageType == grafanaapiserveroptions.StorageTypeEtcd {
 		if err := o.RecommendedOptions.Etcd.Validate(); len(err) > 0 {
 			return err[0]
 		}
 		if err := o.RecommendedOptions.Etcd.ApplyTo(&serverConfig.Config); err != nil {
 			return err
 		}
-
-	case grafanaapiserveroptions.StorageTypeUnified:
-		server, err := sql.ProvideResourceServer(s.db, s.cfg, s.features, s.tracing)
-		if err != nil {
-			return err
-		}
-		client := resource.NewLocalResourceClient(server)
-		serverConfig.Config.RESTOptionsGetter = apistore.NewRESTOptionsGetterForClient(client,
-			o.RecommendedOptions.Etcd.StorageConfig)
-
-	case grafanaapiserveroptions.StorageTypeUnifiedGrpc:
-		opts := []grpc.DialOption{
-			grpc.WithStatsHandler(otelgrpc.NewClientHandler()),
-			grpc.WithTransportCredentials(insecure.NewCredentials()),
-		}
-		// Create a connection to the gRPC server
-		conn, err := grpc.NewClient(o.StorageOptions.Address, opts...)
-		if err != nil {
-			return err
-		}
-
-		// Create a client instance
-		client := resource.NewResourceClient(conn)
-		serverConfig.Config.RESTOptionsGetter = apistore.NewRESTOptionsGetterForClient(client, o.RecommendedOptions.Etcd.StorageConfig)
-
-	case grafanaapiserveroptions.StorageTypeLegacy:
-		fallthrough
-	case grafanaapiserveroptions.StorageTypeFile:
-		restOptionsGetter, err := apistore.NewRESTOptionsGetterForFile(o.StorageOptions.DataPath, o.RecommendedOptions.Etcd.StorageConfig)
-		if err != nil {
-			return err
-		}
-		serverConfig.RESTOptionsGetter = restOptionsGetter
+	} else {
+		// Use unified storage client
+		serverConfig.Config.RESTOptionsGetter = apistore.NewRESTOptionsGetterForClient(
+			s.unified, o.RecommendedOptions.Etcd.StorageConfig)
 	}
 
 	// Add OpenAPI specs for each group+version