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

Storage: store full k8s object in body column (#79480)

Browse Source 
store full k8s object in body column
This commit is contained in:
Dan Cech 2023-12-19 17:34:57 +01:00 committed by GitHub
parent 52dc425458
commit 7613ab7a5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -289,7 +289,7 @@ func (s *service) start(ctx context.Context) error {
return err
}
serverConfig.Config.RESTOptionsGetter = entitystorage.NewRESTOptionsGetter(s.cfg, store, nil)
serverConfig.Config.RESTOptionsGetter = entitystorage.NewRESTOptionsGetter(s.cfg, store, o.Etcd.StorageConfig.Codec)
case StorageTypeUnifiedGrpc:
// Create a connection to the gRPC server
@ -305,7 +305,7 @@ func (s *service) start(ctx context.Context) error {
// Create a client instance
store := entity.NewEntityStoreClientWrapper(conn)
serverConfig.Config.RESTOptionsGetter = entitystorage.NewRESTOptionsGetter(s.cfg, store, nil)
serverConfig.Config.RESTOptionsGetter = entitystorage.NewRESTOptionsGetter(s.cfg, store, o.Etcd.StorageConfig.Codec)
case StorageTypeFile:
serverConfig.RESTOptionsGetter = filestorage.NewRESTOptionsGetter(s.config.dataPath, o.Etcd.StorageConfig)

14
pkg/services/grafana-apiserver/storage/entity/storage.go
View File

@ -100,7 +100,7 @@ func (s *Storage) Create(ctx context.Context, key string, obj runtime.Object, ou
metaAccessor.SetGenerateName("")
}
e, err := resourceToEntity(key, obj, requestInfo)
e, err := resourceToEntity(key, obj, requestInfo, s.codec)
if err != nil {
return err
}
@ -117,7 +117,7 @@ func (s *Storage) Create(ctx context.Context, key string, obj runtime.Object, ou
return fmt.Errorf("this was not a create operation... (%s)", rsp.Status.String())
}
err = entityToResource(rsp.Entity, out)
err = entityToResource(rsp.Entity, out, s.codec)
if err != nil {
return apierrors.NewInternalError(err)
}
@ -151,7 +151,7 @@ func (s *Storage) Delete(ctx context.Context, key string, out runtime.Object, pr
return err
}
err = entityToResource(rsp.Entity, out)
err = entityToResource(rsp.Entity, out, s.codec)
if err != nil {
return apierrors.NewInternalError(err)
}
@ -193,7 +193,7 @@ func (s *Storage) Get(ctx context.Context, key string, opts storage.GetOptions,
return apierrors.NewNotFound(s.gr, key)
}
err = entityToResource(rsp, objPtr)
err = entityToResource(rsp, objPtr, s.codec)
if err != nil {
return apierrors.NewInternalError(err)
}
@ -232,7 +232,7 @@ func (s *Storage) GetList(ctx context.Context, key string, opts storage.ListOpti
for _, r := range rsp.Results {
res := s.newFunc()
err := entityToResource(r, res)
err := entityToResource(r, res, s.codec)
if err != nil {
return apierrors.NewInternalError(err)
}
@ -327,7 +327,7 @@ func (s *Storage) guaranteedUpdate(
return apierrors.NewInternalError(fmt.Errorf("could not successfully update object. key=%s, err=%s", key, err.Error()))
}
e, err := resourceToEntity(key, updatedObj, requestInfo)
e, err := resourceToEntity(key, updatedObj, requestInfo, s.codec)
if err != nil {
return err
}
@ -351,7 +351,7 @@ func (s *Storage) guaranteedUpdate(
return nil // destination is already set
}
err = entityToResource(rsp.Entity, destination)
err = entityToResource(rsp.Entity, destination, s.codec)
if err != nil {
return apierrors.NewInternalError(err)
}

28
pkg/services/grafana-apiserver/storage/entity/utils.go
View File

@ -1,6 +1,7 @@
package entity
import (
"bytes"
"encoding/json"
"reflect"
"time"
@ -8,6 +9,7 @@ import (
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apiserver/pkg/endpoints/request"
@ -16,7 +18,7 @@ import (
)
// this is terrible... but just making it work!!!!
func entityToResource(rsp *entityStore.Entity, res runtime.Object) error {
func entityToResource(rsp *entityStore.Entity, res runtime.Object, codec runtime.Codec) error {
var err error
metaAccessor, err := meta.Accessor(res)
@ -72,13 +74,11 @@ func entityToResource(rsp *entityStore.Entity, res runtime.Object) error {
// TODO fields?
if len(rsp.Body) > 0 {
spec := reflect.ValueOf(res).Elem().FieldByName("Spec")
if spec != (reflect.Value{}) && spec.CanSet() {
err = json.Unmarshal(rsp.Body, spec.Addr().Interface())
if err != nil {
return err
}
decoded, _, err := codec.Decode(rsp.Body, &schema.GroupVersionKind{Group: rsp.Group, Version: rsp.GroupVersion}, res)
if err != nil {
return err
}
res = decoded
}
if len(rsp.Status) > 0 {
@ -94,7 +94,7 @@ func entityToResource(rsp *entityStore.Entity, res runtime.Object) error {
return nil
}
func resourceToEntity(key string, res runtime.Object, requestInfo *request.RequestInfo) (*entityStore.Entity, error) {
func resourceToEntity(key string, res runtime.Object, requestInfo *request.RequestInfo, codec runtime.Codec) (*entityStore.Entity, error) {
metaAccessor, err := meta.Accessor(res)
if err != nil {
return nil, err
@ -147,14 +147,12 @@ func resourceToEntity(key string, res runtime.Object, requestInfo *request.Reque
return nil, err
}
// TODO: store entire object in body?
spec := reflect.ValueOf(res).Elem().FieldByName("Spec")
if spec != (reflect.Value{}) {
rsp.Body, err = json.Marshal(spec.Interface())
if err != nil {
return nil, err
}
var buf bytes.Buffer
err = codec.Encode(res, &buf)
if err != nil {
return nil, err
}
rsp.Body = buf.Bytes()
status := reflect.ValueOf(res).Elem().FieldByName("Status")
if status != (reflect.Value{}) {