IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: refactor grafana-apiserver a bit (#74177)

Browse Source
This commit is contained in:
Kristin Laemmert
2023-08-31 09:12:01 -04:00
committed by GitHub
parent 439270f6cb
commit d1876b68bc
14 changed files with 129 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
pkg/services/grafana-apiserver/service.go
View File

@@ -6,16 +6,14 @@ import (
"net"
"os"
"path"
"strconv"
"cuelang.org/go/pkg/strings"
"github.com/go-logr/logr"
"github.com/grafana/dskit/services"
"github.com/grafana/grafana-apiserver/pkg/certgenerator"
grafanaapiserveroptions "github.com/grafana/grafana-apiserver/pkg/cmd/server/options"
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/request/headerrequest"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/apiserver/pkg/endpoints/responsewriter"
genericapiserver "k8s.io/apiserver/pkg/server"
"k8s.io/apiserver/pkg/server/options"
"k8s.io/client-go/rest"
@@ -23,14 +21,7 @@ import (
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
"k8s.io/klog/v2"
"github.com/grafana/grafana-apiserver/pkg/certgenerator"
"github.com/grafana/grafana/pkg/api/routing"
"github.com/grafana/grafana/pkg/infra/appcontext"
"github.com/grafana/grafana/pkg/middleware"
contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/web"
"github.com/grafana/grafana/pkg/modules"
)
const (
@@ -54,39 +45,19 @@ type service struct {
*services.BasicService
restConfig *rest.Config
rr routing.RouteRegister
handler web.Handler
dataPath string
stopCh chan struct{}
stoppedCh chan error
}
func ProvideService(cfg *setting.Cfg, rr routing.RouteRegister) (*service, error) {
func New(dataPath string) (*service, error) {
s := &service{
rr: rr,
dataPath: path.Join(cfg.DataPath, "k8s"),
dataPath: dataPath,
stopCh: make(chan struct{}),
}
s.BasicService = services.NewBasicService(s.start, s.running, nil).WithName("grafana-apiserver")
s.rr.Group("/k8s", func(k8sRoute routing.RouteRegister) {
handler := func(c *contextmodel.ReqContext) {
if s.handler == nil {
c.Resp.WriteHeader(404)
_, _ = c.Resp.Write([]byte("Not found"))
return
}
if handle, ok := s.handler.(func(c *contextmodel.ReqContext)); ok {
handle(c)
return
}
}
k8sRoute.Any("/", middleware.ReqSignedIn, handler)
k8sRoute.Any("/*", middleware.ReqSignedIn, handler)
})
s.BasicService = services.NewBasicService(s.start, s.running, nil).WithName(modules.GrafanaAPIServer)
return s, nil
}
@@ -115,6 +86,16 @@ func (s *service) start(ctx context.Context) error {
K8sDataPath: s.dataPath,
}
err := certUtil.InitializeCACertPKI()
if err != nil {
return err
}
err = certUtil.EnsureApiServerPKI(certgenerator.DefaultAPIServerIp)
if err != nil {
return err
}
o.RecommendedOptions.SecureServing.BindAddress = net.ParseIP(certgenerator.DefaultAPIServerIp)
o.RecommendedOptions.SecureServing.ServerCert.CertKey = options.CertKey{
CertFile: certUtil.APIServerCertFile(),
@@ -159,26 +140,6 @@ func (s *service) start(ctx context.Context) error {
prepared := server.GenericAPIServer.PrepareRun()
s.handler = func(c *contextmodel.ReqContext) {
req := c.Req
req.URL.Path = strings.TrimPrefix(req.URL.Path, "/k8s")
if req.URL.Path == "" {
req.URL.Path = "/"
}
ctx := req.Context()
signedInUser := appcontext.MustUser(ctx)
req.Header.Set("X-Remote-User", strconv.FormatInt(signedInUser.UserID, 10))
req.Header.Set("X-Remote-Group", "grafana")
req.Header.Set("X-Remote-Extra-token-name", signedInUser.Name)
req.Header.Set("X-Remote-Extra-org-role", string(signedInUser.OrgRole))
req.Header.Set("X-Remote-Extra-org-id", strconv.FormatInt(signedInUser.OrgID, 10))
req.Header.Set("X-Remote-Extra-user-id", strconv.FormatInt(signedInUser.UserID, 10))
resp := responsewriter.WrapForHTTP1Or2(c.Resp)
prepared.GenericAPIServer.Handler.ServeHTTP(resp, req)
}
go func() {
s.stoppedCh <- prepared.Run(s.stopCh)
}()

11
pkg/services/grafana-apiserver/wire.go
View File

@@ -1,11 +0,0 @@
package grafanaapiserver
import (
"github.com/google/wire"
)
var WireSet = wire.NewSet(
ProvideService,
wire.Bind(new(Service), new(*service)),
wire.Bind(new(RestConfigProvider), new(*service)),
)