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

extract kindsys to external library (#64562)

Browse Source 
* extract kindsys

* reinstate kindsys report

This may end up living somewhere else (or not! who knows!), but the important part is that I don't get rid of it right now :)

I hate the package layout (kindsysreport/codegen) for the main function and will take pretty much any alternative suggestion, but we can change also change it later.

Note that the generated report.json is in a different location - anything using this (ops something) needs to be updated.

* kindsysreport in codeowners
This commit is contained in:
Kristin Laemmert
2023-03-15 12:04:28 -04:00
committed by GitHub
parent 3f5acf346d
commit 8745d7ef1b
70 changed files with 390 additions and 1515 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/kinds/dashboard/crd/dashboard_crd_gen.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
_ "embed"
"github.com/grafana/grafana/pkg/kinds/dashboard"
"github.com/grafana/grafana/pkg/kindsys/k8ssys"
"github.com/grafana/kindsys/k8ssys"
)
// The CRD YAML representation of the Dashboard kind.
pkg/kinds/dashboard/dashboard_kind_gen.go
+4 -2
View File
@@ -10,9 +10,11 @@
package dashboard
import (
"github.com/grafana/grafana/pkg/kindsys"
"github.com/grafana/kindsys"
"github.com/grafana/thema"
"github.com/grafana/thema/vmux"
"github.com/grafana/grafana/pkg/cuectx"
)
// rootrel is the relative path from the grafana repository root to the
@@ -34,7 +36,7 @@ var _ kindsys.Core = &Kind{}
// TODO standard generated docs
func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
def, err := kindsys.LoadCoreKindDef(rootrel, rt.Context(), nil)
def, err := cuectx.LoadCoreKindDef(rootrel, rt.Context(), nil)
if err != nil {
return nil, err
}
pkg/kinds/librarypanel/crd/librarypanel_crd_gen.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
_ "embed"
"github.com/grafana/grafana/pkg/kinds/librarypanel"
"github.com/grafana/grafana/pkg/kindsys/k8ssys"
"github.com/grafana/kindsys/k8ssys"
)
// The CRD YAML representation of the LibraryPanel kind.
pkg/kinds/librarypanel/librarypanel_kind_gen.go
+4 -2
View File
@@ -10,9 +10,11 @@
package librarypanel
import (
"github.com/grafana/grafana/pkg/kindsys"
"github.com/grafana/kindsys"
"github.com/grafana/thema"
"github.com/grafana/thema/vmux"
"github.com/grafana/grafana/pkg/cuectx"
)
// rootrel is the relative path from the grafana repository root to the
@@ -34,7 +36,7 @@ var _ kindsys.Core = &Kind{}
// TODO standard generated docs
func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
def, err := kindsys.LoadCoreKindDef(rootrel, rt.Context(), nil)
def, err := cuectx.LoadCoreKindDef(rootrel, rt.Context(), nil)
if err != nil {
return nil, err
}
pkg/kinds/playlist/crd/playlist_crd_gen.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
_ "embed"
"github.com/grafana/grafana/pkg/kinds/playlist"
"github.com/grafana/grafana/pkg/kindsys/k8ssys"
"github.com/grafana/kindsys/k8ssys"
)
// The CRD YAML representation of the Playlist kind.
pkg/kinds/playlist/playlist_kind_gen.go
+4 -2
View File
@@ -10,9 +10,11 @@
package playlist
import (
"github.com/grafana/grafana/pkg/kindsys"
"github.com/grafana/kindsys"
"github.com/grafana/thema"
"github.com/grafana/thema/vmux"
"github.com/grafana/grafana/pkg/cuectx"
)
// rootrel is the relative path from the grafana repository root to the
@@ -34,7 +36,7 @@ var _ kindsys.Core = &Kind{}
// TODO standard generated docs
func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
def, err := kindsys.LoadCoreKindDef(rootrel, rt.Context(), nil)
def, err := cuectx.LoadCoreKindDef(rootrel, rt.Context(), nil)
if err != nil {
return nil, err
}
pkg/kinds/preferences/crd/preferences_crd_gen.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
_ "embed"
"github.com/grafana/grafana/pkg/kinds/preferences"
"github.com/grafana/grafana/pkg/kindsys/k8ssys"
"github.com/grafana/kindsys/k8ssys"
)
// The CRD YAML representation of the Preferences kind.
pkg/kinds/preferences/preferences_kind_gen.go
+4 -2
View File
@@ -10,9 +10,11 @@
package preferences
import (
"github.com/grafana/grafana/pkg/kindsys"
"github.com/grafana/kindsys"
"github.com/grafana/thema"
"github.com/grafana/thema/vmux"
"github.com/grafana/grafana/pkg/cuectx"
)
// rootrel is the relative path from the grafana repository root to the
@@ -34,7 +36,7 @@ var _ kindsys.Core = &Kind{}
// TODO standard generated docs
func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
def, err := kindsys.LoadCoreKindDef(rootrel, rt.Context(), nil)
def, err := cuectx.LoadCoreKindDef(rootrel, rt.Context(), nil)
if err != nil {
return nil, err
}
pkg/kinds/publicdashboard/crd/publicdashboard_crd_gen.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
_ "embed"
"github.com/grafana/grafana/pkg/kinds/publicdashboard"
"github.com/grafana/grafana/pkg/kindsys/k8ssys"
"github.com/grafana/kindsys/k8ssys"
)
// The CRD YAML representation of the PublicDashboard kind.
pkg/kinds/publicdashboard/publicdashboard_kind_gen.go
+4 -2
View File
@@ -10,9 +10,11 @@
package publicdashboard
import (
"github.com/grafana/grafana/pkg/kindsys"
"github.com/grafana/kindsys"
"github.com/grafana/thema"
"github.com/grafana/thema/vmux"
"github.com/grafana/grafana/pkg/cuectx"
)
// rootrel is the relative path from the grafana repository root to the
@@ -34,7 +36,7 @@ var _ kindsys.Core = &Kind{}
// TODO standard generated docs
func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
def, err := kindsys.LoadCoreKindDef(rootrel, rt.Context(), nil)
def, err := cuectx.LoadCoreKindDef(rootrel, rt.Context(), nil)
if err != nil {
return nil, err
}
pkg/kinds/serviceaccount/crd/serviceaccount_crd_gen.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
_ "embed"
"github.com/grafana/grafana/pkg/kinds/serviceaccount"
"github.com/grafana/grafana/pkg/kindsys/k8ssys"
"github.com/grafana/kindsys/k8ssys"
)
// The CRD YAML representation of the ServiceAccount kind.
pkg/kinds/serviceaccount/serviceaccount_kind_gen.go
+4 -2
View File
@@ -10,9 +10,11 @@
package serviceaccount
import (
"github.com/grafana/grafana/pkg/kindsys"
"github.com/grafana/kindsys"
"github.com/grafana/thema"
"github.com/grafana/thema/vmux"
"github.com/grafana/grafana/pkg/cuectx"
)
// rootrel is the relative path from the grafana repository root to the
@@ -34,7 +36,7 @@ var _ kindsys.Core = &Kind{}
// TODO standard generated docs
func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
def, err := kindsys.LoadCoreKindDef(rootrel, rt.Context(), nil)
def, err := cuectx.LoadCoreKindDef(rootrel, rt.Context(), nil)
if err != nil {
return nil, err
}
pkg/kinds/team/crd/team_crd_gen.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
_ "embed"
"github.com/grafana/grafana/pkg/kinds/team"
"github.com/grafana/grafana/pkg/kindsys/k8ssys"
"github.com/grafana/kindsys/k8ssys"
)
// The CRD YAML representation of the Team kind.
pkg/kinds/team/team_kind_gen.go
+4 -2
View File
@@ -10,9 +10,11 @@
package team
import (
"github.com/grafana/grafana/pkg/kindsys"
"github.com/grafana/kindsys"
"github.com/grafana/thema"
"github.com/grafana/thema/vmux"
"github.com/grafana/grafana/pkg/cuectx"
)
// rootrel is the relative path from the grafana repository root to the
@@ -34,7 +36,7 @@ var _ kindsys.Core = &Kind{}
// TODO standard generated docs
func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
def, err := kindsys.LoadCoreKindDef(rootrel, rt.Context(), nil)
def, err := cuectx.LoadCoreKindDef(rootrel, rt.Context(), nil)
if err != nil {
return nil, err
}