certgenerator fixes

go.mod

@@ -29,7 +29,7 @@ replace go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.open
 
 replace go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0
 
-// replace github.com/grafana/grafana-apiserver => /Users/charandas/go/src/github.com/grafana/grafana-apiserver
+replace github.com/grafana/grafana-apiserver => /Users/charandas/go/src/github.com/grafana/grafana-apiserver
 
 // Override Prometheus version because Prometheus v2.X is tagged as v0.X for Go modules purposes and Go assumes
 // that v1.Y is higher than v0.X, so when we resolve dependencies if any dependency imports v1.Y we'd

pkg/modules/registry/registry.go

@@ -2,12 +2,12 @@ package registry
 
 import (
 	"github.com/grafana/dskit/services"
+	"github.com/grafana/grafana-apiserver/pkg/certgenerator"
 
 	"github.com/grafana/grafana/pkg/api"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/modules"
 	"github.com/grafana/grafana/pkg/registry/coregrd"
-	"github.com/grafana/grafana/pkg/services/certgenerator"
 	"github.com/grafana/grafana/pkg/services/k8s/apiserver"
 	"github.com/grafana/grafana/pkg/services/k8s/client"
 	"github.com/grafana/grafana/pkg/services/provisioning"
@@ -23,7 +23,7 @@ func ProvideRegistry(
 	moduleManager modules.Manager,
 	apiServer apiserver.Service,
 	clientset client.Service,
-	certGenerator certgenerator.Service,
+	certGenerator certgenerator.ServiceInterface,
 	httpServer *api.HTTPServer,
 	provisioning *provisioning.ProvisioningServiceImpl,
 	coreGRDRegistry *coregrd.Registry,

pkg/services/certgenerator/service.go

@@ -3,29 +3,12 @@ package certgenerator
 import (
 	"path/filepath"
 
-	"github.com/grafana/dskit/services"
-	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/modules"
 	"github.com/grafana/grafana/pkg/setting"
 
 	"github.com/grafana/grafana-apiserver/pkg/certgenerator"
 )
 
-const (
-	DefaultAPIServerIp = "127.0.0.1"
-)
-
-var (
-	_ services.NamedService = (*certgenerator.Service)(nil)
-)
-
-type service struct {
-	*services.BasicService
-	cfg      *setting.Cfg
-	certUtil *certgenerator.CertUtil
-	Log      log.Logger
-}
-
 func ProvideService(cfg *setting.Cfg) (*certgenerator.Service, error) {
 	return certgenerator.CreateService(modules.CertGenerator, filepath.Join(cfg.DataPath, "k8s"))
 }

pkg/services/certgenerator/wire.go

@@ -2,11 +2,10 @@ package certgenerator
 
 import (
 	"github.com/google/wire"
-	"github.com/grafana/dskit/services"
 	"github.com/grafana/grafana-apiserver/pkg/certgenerator"
 )
 
 var WireSet = wire.NewSet(
 	ProvideService,
-	wire.Bind(new(services.NamedService), new(*certgenerator.Service)),
+	wire.Bind(new(certgenerator.ServiceInterface), new(*certgenerator.Service)),
 )