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

K8s/Dashboard: Promote from alpha1 to beta1 (#104009)

Browse Source
This commit is contained in:
Ryan McKinley
2025-04-23 20:54:35 +03:00
committed by GitHub
parent a6866176cd
commit b09d79b21c
84 changed files with 532 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tests/apis/provisioning/client_test.go
+10 -7
View File
@@ -7,6 +7,7 @@ import (
"github.com/stretchr/testify/require"
"k8s.io/apimachinery/pkg/runtime/schema"
dashboardV1 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1"
"github.com/grafana/grafana/pkg/registry/apis/provisioning/resources"
)
@@ -24,22 +25,24 @@ func TestIntegrationProvisioning_Client(t *testing.T) {
t.Run("dashboard client support", func(t *testing.T) {
_, _, err := clients.ForResource(schema.GroupVersionResource{
Group: "dashboard.grafana.app",
Group: dashboardV1.GROUP,
Version: dashboardV1.VERSION,
Resource: "dashboards",
Version: "v1alpha1",
})
require.NoError(t, err)
// With empty version, we should get the preferred version (v1alpha1)
_, _, err = clients.ForResource(schema.GroupVersionResource{
Group: "dashboard.grafana.app",
// With empty version, we should get the preferred version (v1beta1)
_, gvk, err := clients.ForResource(schema.GroupVersionResource{
Group: dashboardV1.GROUP,
Resource: "dashboards",
})
require.NoError(t, err)
require.Equal(t, dashboardV1.VERSION, gvk.Version)
require.Equal(t, "Dashboard", gvk.Kind)
_, _, err = clients.ForKind(schema.GroupVersionKind{
Group: "dashboard.grafana.app",
Version: "v1alpha1",
Group: dashboardV1.GROUP,
Version: dashboardV1.VERSION,
Kind: "Dashboard",
})
require.NoError(t, err)
pkg/tests/apis/provisioning/exportunifiedtorepository/root_dashboard.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"apiVersion": "dashboard.grafana.app/v1alpha1",
"apiVersion": "dashboard.grafana.app/v1beta1",
"kind": "Dashboard",
"metadata": {
"name": "root_dashboard",
pkg/tests/apis/provisioning/helper_test.go
+1 -1
View File
@@ -23,7 +23,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/rest"
dashboard "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1alpha1"
dashboard "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1"
folder "github.com/grafana/grafana/apps/folder/pkg/apis/folder/v1beta1"
provisioning "github.com/grafana/grafana/pkg/apis/provisioning/v0alpha1"
grafanarest "github.com/grafana/grafana/pkg/apiserver/rest"