fix(packages): render XRD correctly

grafana · Dec 4, 2024 · 9815987 · 9815987
1 parent cf52a6d
commit 9815987
Show file tree

Hide file tree

Showing 49 changed files with 33,944 additions and 6,928 deletions.
diff --git a/generator/packages.libsonnet b/generator/packages.libsonnet
@@ -27,7 +27,7 @@ std.foldl(
     + {
       [configurationName + '/package.yaml']: manifest(package(configurationName)),
       [configurationName + '/Composition-' + kind + '.yaml']: manifest(item.composition),
-      [configurationName + '/CompositeResourceDefinition-' + kind + '.yaml']: manifest(item.composition),
+      [configurationName + '/CompositeResourceDefinition-' + kind + '.yaml']: manifest(item.definition),
     },
   namespaced,
   {}

diff --git a/packages/grafana-namespaced-alerting/CompositeResourceDefinition-ContactPoint.yaml b/packages/grafana-namespaced-alerting/CompositeResourceDefinition-ContactPoint.yaml
diff --git a/packages/grafana-namespaced-alerting/CompositeResourceDefinition-MessageTemplate.yaml b/packages/grafana-namespaced-alerting/CompositeResourceDefinition-MessageTemplate.yaml
diff --git a/packages/grafana-namespaced-alerting/CompositeResourceDefinition-MuteTiming.yaml b/packages/grafana-namespaced-alerting/CompositeResourceDefinition-MuteTiming.yaml
diff --git a/packages/grafana-namespaced-alerting/CompositeResourceDefinition-NotificationPolicy.yaml b/packages/grafana-namespaced-alerting/CompositeResourceDefinition-NotificationPolicy.yaml
diff --git a/packages/grafana-namespaced-alerting/CompositeResourceDefinition-RuleGroup.yaml b/packages/grafana-namespaced-alerting/CompositeResourceDefinition-RuleGroup.yaml
diff --git a/packages/grafana-namespaced-cloud/CompositeResourceDefinition-AccessPolicy.yaml b/packages/grafana-namespaced-cloud/CompositeResourceDefinition-AccessPolicy.yaml
diff --git a/packages/grafana-namespaced-cloud/CompositeResourceDefinition-AccessPolicyToken.yaml b/packages/grafana-namespaced-cloud/CompositeResourceDefinition-AccessPolicyToken.yaml
diff --git a/packages/grafana-namespaced-cloud/CompositeResourceDefinition-PluginInstallation.yaml b/packages/grafana-namespaced-cloud/CompositeResourceDefinition-PluginInstallation.yaml
diff --git a/packages/grafana-namespaced-cloud/CompositeResourceDefinition-Stack.yaml b/packages/grafana-namespaced-cloud/CompositeResourceDefinition-Stack.yaml
diff --git a/packages/grafana-namespaced-cloud/CompositeResourceDefinition-StackServiceAccount.yaml b/packages/grafana-namespaced-cloud/CompositeResourceDefinition-StackServiceAccount.yaml
diff --git a/packages/grafana-namespaced-cloud/CompositeResourceDefinition-StackServiceAccountToken.yaml b/packages/grafana-namespaced-cloud/CompositeResourceDefinition-StackServiceAccountToken.yaml
diff --git a/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-DataSourcePermission.yaml b/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-DataSourcePermission.yaml
diff --git a/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-Report.yaml b/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-Report.yaml
diff --git a/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-Role.yaml b/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-Role.yaml
diff --git a/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-RoleAssignment.yaml b/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-RoleAssignment.yaml
diff --git a/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-TeamExternalGroup.yaml b/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-TeamExternalGroup.yaml
diff --git a/packages/grafana-namespaced-ml/CompositeResourceDefinition-Holiday.yaml b/packages/grafana-namespaced-ml/CompositeResourceDefinition-Holiday.yaml
diff --git a/packages/grafana-namespaced-ml/CompositeResourceDefinition-Job.yaml b/packages/grafana-namespaced-ml/CompositeResourceDefinition-Job.yaml
diff --git a/packages/grafana-namespaced-ml/CompositeResourceDefinition-OutlierDetector.yaml b/packages/grafana-namespaced-ml/CompositeResourceDefinition-OutlierDetector.yaml
diff --git a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Escalation.yaml b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Escalation.yaml
diff --git a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-EscalationChain.yaml b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-EscalationChain.yaml
diff --git a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Integration.yaml b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Integration.yaml
diff --git a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-OnCallShift.yaml b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-OnCallShift.yaml
diff --git a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-OutgoingWebhook.yaml b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-OutgoingWebhook.yaml
diff --git a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Route.yaml b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Route.yaml
diff --git a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Schedule.yaml b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Schedule.yaml
diff --git a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-UserNotificationRule.yaml b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-UserNotificationRule.yaml
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-Annotation.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-Annotation.yaml
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-Dashboard.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-Dashboard.yaml
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-DashboardPermission.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-DashboardPermission.yaml
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-DashboardPublic.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-DashboardPublic.yaml
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-DataSource.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-DataSource.yaml
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-Folder.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-Folder.yaml
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-FolderPermission.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-FolderPermission.yaml
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-LibraryPanel.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-LibraryPanel.yaml
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-Organization.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-Organization.yaml
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-OrganizationPreferences.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-OrganizationPreferences.yaml
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-Playlist.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-Playlist.yaml
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-ServiceAccount.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-ServiceAccount.yaml
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-ServiceAccountPermission.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-ServiceAccountPermission.yaml
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-ServiceAccountToken.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-ServiceAccountToken.yaml
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-SsoSettings.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-SsoSettings.yaml
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-Team.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-Team.yaml
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-User.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-User.yaml
diff --git a/packages/grafana-namespaced-slo/CompositeResourceDefinition-SLO.yaml b/packages/grafana-namespaced-slo/CompositeResourceDefinition-SLO.yaml
diff --git a/packages/grafana-namespaced-sm/CompositeResourceDefinition-Check.yaml b/packages/grafana-namespaced-sm/CompositeResourceDefinition-Check.yaml
diff --git a/packages/grafana-namespaced-sm/CompositeResourceDefinition-Installation.yaml b/packages/grafana-namespaced-sm/CompositeResourceDefinition-Installation.yaml
diff --git a/packages/grafana-namespaced-sm/CompositeResourceDefinition-Probe.yaml b/packages/grafana-namespaced-sm/CompositeResourceDefinition-Probe.yaml