public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

K8s: Add error to GetRestConfig (#101147)

Browse Source 
K8s: Add error to RestConfigProvider return values
This commit is contained in:
Todd Treece
2025-02-21 18:07:13 +02:00
committed by GitHub
parent 2010c66108
commit 9e80b0f913
8 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/registry/apps/apps.go
+5 -5
View File
@@ -34,13 +34,13 @@ func ProvideRegistryServiceSink(
investigationAppProvider *investigations.InvestigationsAppProvider,
advisorAppProvider *advisor.AdvisorAppProvider,
) (*Service, error) {
cfgWrapper := func(ctx context.Context) *rest.Config {
cfg := restConfigProvider.GetRestConfig(ctx)
if cfg == nil {
return nil
cfgWrapper := func(ctx context.Context) (*rest.Config, error) {
cfg, err := restConfigProvider.GetRestConfig(ctx)
if err != nil {
return nil, err
}
cfg.APIPath = "/apis"
return cfg
return cfg, nil
}
cfg := runner.RunnerConfig{
pkg/services/apiserver/builder/runner/runner.go
+4 -4
View File
@@ -12,7 +12,7 @@ import (
)
type RunnerConfig struct {
RestConfigGetter func(context.Context) *rest.Config
RestConfigGetter func(context.Context) (*rest.Config, error)
APIRegistrar builder.APIRegistrar
}
@@ -49,9 +49,9 @@ func (r *APIGroupRunner) Run(ctx context.Context) error {
func (r *APIGroupRunner) Init(ctx context.Context) error {
defer close(r.initialized)
restConfig := r.config.RestConfigGetter(ctx)
if restConfig == nil {
return fmt.Errorf("rest config is nil")
restConfig, err := r.config.RestConfigGetter(ctx)
if err != nil {
return err
}
for i := range r.groups {
appConfig := app.Config{
pkg/services/apiserver/client/client.go
+28 -29
View File
@@ -11,11 +11,10 @@ import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/rest"
k8sUser "k8s.io/apiserver/pkg/authentication/user"
k8sRequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/rest"
"github.com/grafana/grafana/pkg/apimachinery/identity"
"github.com/grafana/grafana/pkg/infra/log"
@@ -46,13 +45,13 @@ var _ K8sHandler = (*k8sHandler)(nil)
type k8sHandler struct {
namespacer request.NamespaceMapper
gvr schema.GroupVersionResource
restConfig func(context.Context) *rest.Config
restConfig func(context.Context) (*rest.Config, error)
searcher resource.ResourceIndexClient
userService user.Service
}
func NewK8sHandler(dual dualwrite.Service, namespacer request.NamespaceMapper, gvr schema.GroupVersionResource,
restConfig func(context.Context) *rest.Config, dashStore dashboards.Store, userSvc user.Service, resourceClient resource.ResourceClient, sorter sort.Service) K8sHandler {
restConfig func(context.Context) (*rest.Config, error), dashStore dashboards.Store, userSvc user.Service, resourceClient resource.ResourceClient, sorter sort.Service) K8sHandler {
legacySearcher := legacysearcher.NewDashboardSearchClient(dashStore, sorter)
searchClient := resource.NewSearchClient(dual, gvr.GroupResource(), resourceClient, legacySearcher)
@@ -79,9 +78,9 @@ func (h *k8sHandler) Get(ctx context.Context, name string, orgID int64, options
defer cancel()
}
client, ok := h.getClient(newCtx, orgID)
if !ok {
return nil, nil
client, err := h.getClient(newCtx, orgID)
if err != nil {
return nil, err
}
return client.Get(newCtx, name, options, subresource...)
@@ -97,9 +96,9 @@ func (h *k8sHandler) Create(ctx context.Context, obj *unstructured.Unstructured,
defer cancel()
}
client, ok := h.getClient(newCtx, orgID)
if !ok {
return nil, nil
client, err := h.getClient(newCtx, orgID)
if err != nil {
return nil, err
}
return client.Create(newCtx, obj, v1.CreateOptions{})
@@ -115,9 +114,9 @@ func (h *k8sHandler) Update(ctx context.Context, obj *unstructured.Unstructured,
defer cancel()
}
client, ok := h.getClient(newCtx, orgID)
if !ok {
return nil, nil
client, err := h.getClient(newCtx, orgID)
if err != nil {
return nil, err
}
return client.Update(newCtx, obj, v1.UpdateOptions{})
@@ -133,9 +132,9 @@ func (h *k8sHandler) Delete(ctx context.Context, name string, orgID int64, optio
defer cancel()
}
client, ok := h.getClient(newCtx, orgID)
if !ok {
return nil
client, err := h.getClient(newCtx, orgID)
if err != nil {
return err
}
return client.Delete(newCtx, name, options)
@@ -151,9 +150,9 @@ func (h *k8sHandler) DeleteCollection(ctx context.Context, orgID int64) error {
defer cancel()
}
client, ok := h.getClient(newCtx, orgID)
if !ok {
return fmt.Errorf("could not get k8s client")
client, err := h.getClient(newCtx, orgID)
if err != nil {
return err
}
return client.DeleteCollection(newCtx, v1.DeleteOptions{}, v1.ListOptions{})
@@ -169,9 +168,9 @@ func (h *k8sHandler) List(ctx context.Context, orgID int64, options v1.ListOptio
defer cancel()
}
client, ok := h.getClient(newCtx, orgID)
if !ok {
return nil, fmt.Errorf("could not get k8s client")
client, err := h.getClient(newCtx, orgID)
if err != nil {
return nil, err
}
return client.List(newCtx, options)
@@ -226,18 +225,18 @@ func (h *k8sHandler) GetUserFromMeta(ctx context.Context, userMeta string) (*use
return u, err
}
func (h *k8sHandler) getClient(ctx context.Context, orgID int64) (dynamic.ResourceInterface, bool) {
cfg := h.restConfig(ctx)
if cfg == nil {
return nil, false
func (h *k8sHandler) getClient(ctx context.Context, orgID int64) (dynamic.ResourceInterface, error) {
cfg, err := h.restConfig(ctx)
if err != nil {
return nil, err
}
dyn, err := dynamic.NewForConfig(cfg)
if err != nil {
return nil, false
return nil, fmt.Errorf("could not create dynamic client: %w", err)
}
return dyn.Resource(h.gvr).Namespace(h.GetNamespace(orgID)), true
return dyn.Resource(h.gvr).Namespace(h.GetNamespace(orgID)), nil
}
func (h *k8sHandler) getK8sContext(ctx context.Context) (context.Context, context.CancelFunc, error) {
pkg/services/apiserver/client/client_mock.go
+2 -2
View File
@@ -94,6 +94,6 @@ type MockTestRestConfig struct {
cfg *rest.Config
}
func (r MockTestRestConfig) GetRestConfig(ctx context.Context) *rest.Config {
return r.cfg
func (r MockTestRestConfig) GetRestConfig(ctx context.Context) (*rest.Config, error) {
return r.cfg, nil
}
pkg/services/apiserver/service.go
+5 -5
View File
@@ -92,7 +92,7 @@ func init() {
// The client Config gets initialized during the first call to
// ProvideService.
// Any call to GetRestConfig will block until we have a restConfig available
func GetRestConfig(ctx context.Context) *clientrest.Config {
func GetRestConfig(ctx context.Context) (*clientrest.Config, error) {
<-ready
return restConfig.GetRestConfig(ctx)
}
@@ -104,7 +104,7 @@ type Service interface {
}
type RestConfigProvider interface {
GetRestConfig(context.Context) *clientrest.Config
GetRestConfig(context.Context) (*clientrest.Config, error)
}
type DirectRestConfigProvider interface {
@@ -244,11 +244,11 @@ func ProvideService(
return s, nil
}
func (s *service) GetRestConfig(ctx context.Context) *clientrest.Config {
func (s *service) GetRestConfig(ctx context.Context) (*clientrest.Config, error) {
if err := s.NamedService.AwaitRunning(ctx); err != nil {
return nil
return nil, fmt.Errorf("unable to get rest config: %w", err)
}
return s.restConfig
return s.restConfig, nil
}
func (s *service) IsDisabled() bool {
pkg/services/authz/rbac.go
+2 -2
View File
@@ -159,7 +159,7 @@ func RegisterRBACAuthZService(
if folderAPIURL == "" {
folderStore = store.NewSQLFolderStore(db, tracer)
} else {
folderStore = store.NewAPIFolderStore(tracer, func(ctx context.Context) *rest.Config {
folderStore = store.NewAPIFolderStore(tracer, func(ctx context.Context) (*rest.Config, error) {
return &rest.Config{
Host: folderAPIURL,
WrapTransport: func(rt http.RoundTripper) http.RoundTripper {
@@ -167,7 +167,7 @@ func RegisterRBACAuthZService(
},
QPS: 50,
Burst: 100,
}
}, nil
})
}
pkg/services/authz/rbac/store/folder_store.go
+7 -3
View File
@@ -102,13 +102,13 @@ func (s *SQLFolderStore) ListFolders(ctx context.Context, ns types.NamespaceInfo
var _ FolderStore = (*APIFolderStore)(nil)
func NewAPIFolderStore(tracer tracing.Tracer, configProvider func(ctx context.Context) *rest.Config) *APIFolderStore {
func NewAPIFolderStore(tracer tracing.Tracer, configProvider func(ctx context.Context) (*rest.Config, error)) *APIFolderStore {
return &APIFolderStore{tracer, configProvider}
}
type APIFolderStore struct {
tracer tracing.Tracer
configProvider func(ctx context.Context) *rest.Config
configProvider func(ctx context.Context) (*rest.Config, error)
}
func (s *APIFolderStore) ListFolders(ctx context.Context, ns types.NamespaceInfo) ([]Folder, error) {
@@ -150,7 +150,11 @@ func (s *APIFolderStore) ListFolders(ctx context.Context, ns types.NamespaceInfo
}
func (s *APIFolderStore) client(ctx context.Context, namespace string) (dynamic.ResourceInterface, error) {
client, err := dynamic.NewForConfig(s.configProvider(ctx))
cfg, err := s.configProvider(ctx)
if err != nil {
return nil, err
}
client, err := dynamic.NewForConfig(cfg)
if err != nil {
return nil, err
}
pkg/services/folder/folderimpl/folder_unifiedstorage_test.go
+2 -2
View File
@@ -48,10 +48,10 @@ type rcp struct {
Host string
}
func (r rcp) GetRestConfig(ctx context.Context) *clientrest.Config {
func (r rcp) GetRestConfig(ctx context.Context) (*clientrest.Config, error) {
return &clientrest.Config{
Host: r.Host,
}
}, nil
}
func TestIntegrationFolderServiceViaUnifiedStorage(t *testing.T) {