IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-27 03:11:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Fix grafana-apiserver config (#74608)

Browse Source
This commit is contained in:
Todd Treece 2023-09-08 10:12:12 -04:00 committed by GitHub
parent 270ef4412d
commit 699c5c1e2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,8 +9,12 @@ import (
"github.com/go-logr/logr"
"github.com/grafana/dskit/services"
kindsv1 "github.com/grafana/grafana-apiserver/pkg/apis/kinds/v1"
grafanaapiserver "github.com/grafana/grafana-apiserver/pkg/apiserver"
"github.com/grafana/grafana-apiserver/pkg/certgenerator"
grafanaapiserveroptions "github.com/grafana/grafana-apiserver/pkg/cmd/server/options"
"github.com/grafana/grafana/pkg/modules"
"github.com/grafana/grafana-apiserver/pkg/storage/filepath"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/request/headerrequest"
"k8s.io/apiserver/pkg/authentication/user"
@ -21,7 +25,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/modules"
)
const (
@ -78,6 +82,7 @@ func (s *service) start(ctx context.Context) error {
o.RecommendedOptions.Authorization.AlwaysAllowPaths = []string{"*"}
o.RecommendedOptions.Authorization.AlwaysAllowGroups = []string{user.SystemPrivilegedGroup, "grafana"}
o.RecommendedOptions.Etcd = nil
o.RecommendedOptions.Admission = nil
o.RecommendedOptions.CoreAPI = nil
// Get the util to get the paths to pre-generated certs
@ -117,6 +122,10 @@ func (s *service) start(ctx context.Context) error {
return err
}
serverConfig.ExtraConfig.RESTOptionsGetter = filepath.NewRESTOptionsGetter(s.dataPath, unstructured.UnstructuredJSONScheme)
serverConfig.GenericConfig.RESTOptionsGetter = filepath.NewRESTOptionsGetter(s.dataPath, grafanaapiserver.Codecs.LegacyCodec(kindsv1.SchemeGroupVersion))
serverConfig.GenericConfig.Config.RESTOptionsGetter = filepath.NewRESTOptionsGetter(s.dataPath, grafanaapiserver.Codecs.LegacyCodec(kindsv1.SchemeGroupVersion))
authenticator, err := newAuthenticator(rootCert)
if err != nil {
return err