[release-12.0.1] K8s: Dashboards: Fix transformation between v1 and v2 (#104502) (#104527)

K8s: Dashboards: Fix transformation between v1 and v2 (#104502)
pull/104585/head
Stephanie Hingtgen 3 months ago committed by GitHub
parent f04144c742
commit 549833e40d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      apps/dashboard/kinds/v2alpha1/dashboard_spec.cue
  2. 2
      apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec.cue
  3. 2
      apps/dashboard/pkg/apis/dashboard/v2alpha1/dashboard_spec_gen.go
  4. 2
      apps/dashboard/pkg/apis/dashboard/v2alpha1/zz_generated.openapi.go
  5. 1
      apps/dashboard/pkg/apis/dashboard/v2alpha1/zz_generated.openapi_violation_exceptions.list
  6. 2
      pkg/tests/apis/openapi_snapshots/dashboard.grafana.app-v2alpha1.json

@ -78,7 +78,7 @@ AnnotationPanelFilter: {
exclude?: bool | *false exclude?: bool | *false
// Panel IDs that should be included or excluded // Panel IDs that should be included or excluded
ids: [...uint8] ids: [...uint32]
} }
// "Off" for no shared crosshair or tooltip (default). // "Off" for no shared crosshair or tooltip (default).

@ -82,7 +82,7 @@ AnnotationPanelFilter: {
exclude?: bool | *false exclude?: bool | *false
// Panel IDs that should be included or excluded // Panel IDs that should be included or excluded
ids: [...uint8] ids: [...uint32]
} }
// "Off" for no shared crosshair or tooltip (default). // "Off" for no shared crosshair or tooltip (default).

@ -73,7 +73,7 @@ type DashboardAnnotationPanelFilter struct {
// Should the specified panels be included or excluded // Should the specified panels be included or excluded
Exclude *bool `json:"exclude,omitempty"` Exclude *bool `json:"exclude,omitempty"`
// Panel IDs that should be included or excluded // Panel IDs that should be included or excluded
Ids []uint8 `json:"ids"` Ids []uint32 `json:"ids"`
} }
// NewDashboardAnnotationPanelFilter creates a new DashboardAnnotationPanelFilter object. // NewDashboardAnnotationPanelFilter creates a new DashboardAnnotationPanelFilter object.

@ -538,7 +538,7 @@ func schema_pkg_apis_dashboard_v2alpha1_DashboardAnnotationPanelFilter(ref commo
SchemaProps: spec.SchemaProps{ SchemaProps: spec.SchemaProps{
Default: 0, Default: 0,
Type: []string{"integer"}, Type: []string{"integer"},
Format: "byte", Format: "int64",
}, },
}, },
}, },

@ -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,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,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,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,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,DashboardConditionalRenderingGroupSpec,Items
API rule violation: list_type_missing,github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1,DashboardCustomVariableSpec,Options API rule violation: list_type_missing,github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2alpha1,DashboardCustomVariableSpec,Options

@ -1212,7 +1212,7 @@
"type": "array", "type": "array",
"items": { "items": {
"type": "integer", "type": "integer",
"format": "byte", "format": "int64",
"default": 0 "default": 0
} }
} }

Loading…
Cancel
Save