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

K8s: Playlist apply fix (#76971)

Browse Source
This commit is contained in:
Todd Treece
2023-10-24 10:19:17 -04:00
committed by GitHub
parent 33f959612f
commit 162a422f0a
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,6 @@ import (
"github.com/go-logr/logr"
"github.com/grafana/dskit/services"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/serializer"
@@ -163,7 +162,19 @@ func (s *service) start(ctx context.Context) error {
logger.Error(err, "failed to set log level")
}
o := options.NewRecommendedOptions("", unstructured.UnstructuredJSONScheme)
// Get the list of groups the server will support
builders := s.builders
groupVersions := make([]schema.GroupVersion, 0, len(builders))
// Install schemas
for _, b := range builders {
groupVersions = append(groupVersions, b.GetGroupVersion())
if err := b.InstallSchema(Scheme); err != nil {
return err
}
}
o := options.NewRecommendedOptions("/registry/grafana.app", Codecs.LegacyCodec(groupVersions...))
o.SecureServing.BindAddress = s.config.ip
o.SecureServing.BindPort = s.config.port
o.Authentication.RemoteKubeConfigFileOptional = true
@@ -209,6 +220,9 @@ func (s *service) start(ctx context.Context) error {
}
if o.Etcd != nil {
if err := o.Etcd.Complete(serverConfig.Config.StorageObjectCountTracker, serverConfig.Config.DrainedNotify(), serverConfig.Config.AddPostStartHook); err != nil {
return err
}
if err := o.Etcd.ApplyTo(&serverConfig.Config); err != nil {
return err
}
@@ -216,16 +230,6 @@ func (s *service) start(ctx context.Context) error {
serverConfig.Authorization.Authorizer = s.authorizer
// Get the list of groups the server will support
builders := s.builders
// Install schemas
for _, b := range builders {
if err := b.InstallSchema(Scheme); err != nil {
return err
}
}
// Add OpenAPI specs for each group+version
defsGetter := getOpenAPIDefinitions(builders)
serverConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(