Folders: update manifest (avoid useoldmanifestkinds) (#114827)

This commit is contained in:
Ryan McKinley
2025-12-05 15:01:11 +03:00
committed by GitHub
parent be99781176
commit 75eb820c73
33 changed files with 58 additions and 330 deletions
+2 -4
View File
@@ -14,7 +14,6 @@ import (
"time"
"github.com/google/uuid"
"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v0alpha1"
"github.com/prometheus/common/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -23,6 +22,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v0alpha1"
folders "github.com/grafana/grafana/apps/folder/pkg/apis/folder/v1beta1"
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/apimachinery/utils"
@@ -357,9 +357,7 @@ func doFolderTests(t *testing.T, helper *apis.K8sTestHelper) *apis.K8sTestHelper
"spec": {
"title": "Test",
"description": ""
},
"status": {}
}`
}}`
// Get should return the same result
found, err := client.Resource.Get(context.Background(), uid, metav1.GetOptions{})
@@ -1103,8 +1103,7 @@
"type": "object",
"required": [
"metadata",
"spec",
"status"
"spec"
],
"properties": {
"apiVersion": {
@@ -1131,14 +1130,6 @@
"$ref": "#/components/schemas/com.github.grafana.grafana.apps.folder.pkg.apis.folder.v1beta1.FolderSpec"
}
]
},
"status": {
"default": {},
"allOf": [
{
"$ref": "#/components/schemas/com.github.grafana.grafana.apps.folder.pkg.apis.folder.v1beta1.FolderStatus"
}
]
}
},
"x-kubernetes-group-version-kind": [
@@ -1329,10 +1320,6 @@
}
}
},
"com.github.grafana.grafana.apps.folder.pkg.apis.folder.v1beta1.FolderStatus": {
"description": "Empty stub",
"type": "object"
},
"com.github.grafana.grafana.apps.folder.pkg.apis.folder.v1beta1.ResourceStats": {
"type": "object",
"required": [