Merge remote-tracking branch 'origin/main' into ds-apiserver-schema-builder

pkg/tests/apis/openapi_snapshots/notifications.alerting.grafana.app-v0alpha1.json

@@ -3783,18 +3783,29 @@
         "type": "object",
         "required": [
           "title",
-          "content"
+          "content",
+          "kind"
         ],
         "properties": {
           "content": {
             "type": "string"
           },
+          "kind": {
+            "$ref": "#/components/schemas/com.github.grafana.grafana.apps.alerting.notifications.pkg.apis.alertingnotifications.v0alpha1.TemplateGroupTemplateKind"
+          },
           "title": {
             "type": "string"
           }
         },
         "additionalProperties": false
       },
+      "com.github.grafana.grafana.apps.alerting.notifications.pkg.apis.alertingnotifications.v0alpha1.TemplateGroupTemplateKind": {
+        "type": "string",
+        "enum": [
+          "grafana",
+          "mimir"
+        ]
+      },
       "com.github.grafana.grafana.apps.alerting.notifications.pkg.apis.alertingnotifications.v0alpha1.TimeInterval": {
         "type": "object",
         "required": [

pkg/tests/apis/openapi_snapshots/provisioning.grafana.app-v0alpha1.json

@@ -5295,10 +5295,6 @@
       "com.github.grafana.grafana.apps.provisioning.pkg.apis.provisioning.v0alpha1.MigrateJobOptions": {
         "type": "object",
         "properties": {
-          "history": {
-            "description": "Preserve history (if possible)",
-            "type": "boolean"
-          },
           "message": {
             "description": "Message to use when committing the changes in a single commit",
             "type": "string"
@@ -5828,10 +5824,6 @@
           "kind": {
             "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
             "type": "string"
-          },
-          "legacyStorage": {
-            "description": "The backend is using legacy storage FIXME: Not sure where this should be exposed... but we need it somewhere The UI should force the onboarding workflow when this is true",
-            "type": "boolean"
           }
         }
       },