From 549833e40d53ddd8b93befaee111a824c5168b5c Mon Sep 17 00:00:00 2001 From: Stephanie Hingtgen Date: Fri, 25 Apr 2025 10:02:35 -0600 Subject: [PATCH] [release-12.0.1] K8s: Dashboards: Fix transformation between v1 and v2 (#104502) (#104527) K8s: Dashboards: Fix transformation between v1 and v2 (#104502) --- apps/dashboard/kinds/v2alpha1/dashboard_spec.cue | 2 +- apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec.cue | 2 +- .../dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec_gen.go | 2 +- .../pkg/apis/dashboard/v2alpha1/zz_generated.openapi.go | 2 +- .../v2alpha1/zz_generated.openapi_violation_exceptions.list | 1 + .../apis/openapi_snapshots/dashboard.grafana.app-v2alpha1.json | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/dashboard/kinds/v2alpha1/dashboard_spec.cue b/apps/dashboard/kinds/v2alpha1/dashboard_spec.cue index 141e420b462..b962ac074f6 100644 --- a/apps/dashboard/kinds/v2alpha1/dashboard_spec.cue +++ b/apps/dashboard/kinds/v2alpha1/dashboard_spec.cue @@ -78,7 +78,7 @@ AnnotationPanelFilter: { exclude?: bool | *false // Panel IDs that should be included or excluded - ids: [...uint8] + ids: [...uint32] } // "Off" for no shared crosshair or tooltip (default). diff --git a/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec.cue b/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec.cue index c1acdf81a2f..369ae9f72a4 100644 --- a/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec.cue +++ b/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec.cue @@ -82,7 +82,7 @@ AnnotationPanelFilter: { exclude?: bool | *false // Panel IDs that should be included or excluded - ids: [...uint8] + ids: [...uint32] } // "Off" for no shared crosshair or tooltip (default). diff --git a/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec_gen.go b/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec_gen.go index 70faef285ea..c9ab48a28f7 100644 --- a/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec_gen.go +++ b/apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec_gen.go @@ -73,7 +73,7 @@ type DashboardAnnotationPanelFilter struct { // Should the specified panels be included or excluded Exclude *bool `json:"exclude,omitempty"` // Panel IDs that should be included or excluded - Ids []uint8 `json:"ids"` + Ids []uint32 `json:"ids"` } // NewDashboardAnnotationPanelFilter creates a new DashboardAnnotationPanelFilter object. diff --git a/apps/dashboard/pkg/apis/dashboard/v2alpha1/zz_generated.openapi.go b/apps/dashboard/pkg/apis/dashboard/v2alpha1/zz_generated.openapi.go index 4f548196584..e15e267ae38 100644 --- a/apps/dashboard/pkg/apis/dashboard/v2alpha1/zz_generated.openapi.go +++ b/apps/dashboard/pkg/apis/dashboard/v2alpha1/zz_generated.openapi.go @@ -538,7 +538,7 @@ func schema_pkg_apis_dashboard_v2alpha1_DashboardAnnotationPanelFilter(ref commo SchemaProps: spec.SchemaProps{ Default: 0, Type: []string{"integer"}, - Format: "byte", + Format: "int64", }, }, }, diff --git a/apps/dashboard/pkg/apis/dashboard/v2alpha1/zz_generated.openapi_violation_exceptions.list b/apps/dashboard/pkg/apis/dashboard/v2alpha1/zz_generated.openapi_violation_exceptions.list index 17477f9db13..889a4fcdfed 100644 --- a/apps/dashboard/pkg/apis/dashboard/v2alpha1/zz_generated.openapi_violation_exceptions.list +++ b/apps/dashboard/pkg/apis/dashboard/v2alpha1/zz_generated.openapi_violation_exceptions.list @@ -3,6 +3,7 @@ API rule violation: list_type_missing,github.com/grafana/grafana/apps/dashboard/ API rule violation: list_type_missing,github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1,DashboardAdhocVariableSpec,BaseFilters API rule violation: list_type_missing,github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1,DashboardAdhocVariableSpec,DefaultKeys API rule violation: list_type_missing,github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1,DashboardAdhocVariableSpec,Filters +API rule violation: list_type_missing,github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1,DashboardAnnotationPanelFilter,Ids API rule violation: list_type_missing,github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1,DashboardAutoGridLayoutSpec,Items API rule violation: list_type_missing,github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1,DashboardConditionalRenderingGroupSpec,Items API rule violation: list_type_missing,github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1,DashboardCustomVariableSpec,Options diff --git a/pkg/tests/apis/openapi_snapshots/dashboard.grafana.app-v2alpha1.json b/pkg/tests/apis/openapi_snapshots/dashboard.grafana.app-v2alpha1.json index 8892f4b21cc..0a0cbc0f279 100644 --- a/pkg/tests/apis/openapi_snapshots/dashboard.grafana.app-v2alpha1.json +++ b/pkg/tests/apis/openapi_snapshots/dashboard.grafana.app-v2alpha1.json @@ -1212,7 +1212,7 @@ "type": "array", "items": { "type": "integer", - "format": "byte", + "format": "int64", "default": 0 } }