K8s/Storage: remove github.com/grafana/grafana from go.mod (#104212)
This commit is contained in:
@@ -9,12 +9,14 @@ import (
|
||||
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||
"k8s.io/apimachinery/pkg/runtime/serializer"
|
||||
"k8s.io/apiserver/pkg/storage"
|
||||
"k8s.io/client-go/kubernetes/scheme"
|
||||
"k8s.io/client-go/rest"
|
||||
|
||||
authtypes "github.com/grafana/authlib/types"
|
||||
"github.com/grafana/grafana/pkg/apimachinery/utils"
|
||||
provisioningV0 "github.com/grafana/grafana/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1"
|
||||
"github.com/grafana/grafana/pkg/storage/unified/resource"
|
||||
)
|
||||
|
||||
@@ -123,7 +125,12 @@ func (s *Storage) handleManagedResourceRouting(ctx context.Context,
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
client, err := provisioningV0.NewForConfig(cfg)
|
||||
cfg.NegotiatedSerializer = serializer.WithoutConversionCodecFactory{CodecFactory: scheme.Codecs}
|
||||
cfg.GroupVersion = &schema.GroupVersion{
|
||||
Group: "provisioning.grafana.app",
|
||||
Version: "v0alpha1",
|
||||
}
|
||||
client, err := rest.RESTClientFor(cfg)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -133,7 +140,7 @@ func (s *Storage) handleManagedResourceRouting(ctx context.Context,
|
||||
if err = s.Get(ctx, key, storage.GetOptions{}, rsp); err != nil { // COPY?
|
||||
return err
|
||||
}
|
||||
result := client.RESTClient().Delete().
|
||||
result := client.Delete().
|
||||
Namespace(obj.GetNamespace()).
|
||||
Resource("repositories").
|
||||
Name(repo.Identity).
|
||||
@@ -145,9 +152,9 @@ func (s *Storage) handleManagedResourceRouting(ctx context.Context,
|
||||
var req *rest.Request
|
||||
switch action {
|
||||
case resource.WatchEvent_ADDED:
|
||||
req = client.RESTClient().Post()
|
||||
req = client.Post()
|
||||
case resource.WatchEvent_MODIFIED:
|
||||
req = client.RESTClient().Put()
|
||||
req = client.Put()
|
||||
default:
|
||||
return fmt.Errorf("unsupported provisioning action: %v, %w", action, err)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user