From 5f6cf390111275e9099c587b6eda18a9f4055a7b Mon Sep 17 00:00:00 2001 From: Itay Grudev Date: Sat, 23 Mar 2024 22:26:16 +0200 Subject: [PATCH] Bug Fix: Corrected schema and docs Signed-off-by: Itay Grudev --- charts/cluster/README.md | 6 +++--- charts/cluster/values.schema.json | 7 +------ charts/cluster/values.yaml | 7 +++---- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/charts/cluster/README.md b/charts/cluster/README.md index 7938b96..5eaa111 100644 --- a/charts/cluster/README.md +++ b/charts/cluster/README.md @@ -50,10 +50,10 @@ dependencies: | fullnameOverride | string | `""` | | | grafanaDashboard.annotations | object | `{}` | Annotations that ConfigMaps can have to get configured in Grafana. | | grafanaDashboard.configMapName | string | `"cnpg-grafana-dashboard"` | The name of the ConfigMap containing the dashboard. | -| grafanaDashboard.labels | object | `{"grafana_dashboard":"1"}` | Labels that ConfigMaps should have to get configured in Grafana. | +| grafanaDashboard.labels | object | `{}` | Labels that ConfigMaps should have to get configured in Grafana. | | grafanaDashboard.namespace | string | `""` | Allows overriding the namespace where the ConfigMap will be created, defaulting to the same one as the Release. | -| grafanaDashboard.sidecarLabel | string | `""` | Label that ConfigMaps should have to be loaded as dashboards. DEPRECATED: Use labels instead. | -| grafanaDashboard.sidecarLabelValue | string | `""` | Label value that ConfigMaps should have to be loaded as dashboards. DEPRECATED: Use labels instead. | +| grafanaDashboard.sidecarLabel | string | `"grafana_dashboard"` | Label that ConfigMaps should have to be loaded as dashboards. DEPRECATED: Use labels instead. | +| grafanaDashboard.sidecarLabelValue | string | `"1"` | Label value that ConfigMaps should have to be loaded as dashboards. DEPRECATED: Use labels instead. | | nameOverride | string | `""` | | [operator]: https://github.com/cloudnative-pg/charts/tree/main/charts/cloudnative-pg diff --git a/charts/cluster/values.schema.json b/charts/cluster/values.schema.json index 8824c5a..8882596 100644 --- a/charts/cluster/values.schema.json +++ b/charts/cluster/values.schema.json @@ -15,12 +15,7 @@ "type": "string" }, "labels": { - "type": "object", - "properties": { - "grafana_dashboard": { - "type": "string" - } - } + "type": "object" }, "namespace": { "type": "string" diff --git a/charts/cluster/values.yaml b/charts/cluster/values.yaml index bebc7f3..362b660 100644 --- a/charts/cluster/values.yaml +++ b/charts/cluster/values.yaml @@ -11,11 +11,10 @@ grafanaDashboard: # -- The name of the ConfigMap containing the dashboard. configMapName: "cnpg-grafana-dashboard" # -- Label that ConfigMaps should have to be loaded as dashboards. DEPRECATED: Use labels instead. - sidecarLabel: "" + sidecarLabel: "grafana_dashboard" # -- Label value that ConfigMaps should have to be loaded as dashboards. DEPRECATED: Use labels instead. - sidecarLabelValue: "" + sidecarLabelValue: "1" # -- Labels that ConfigMaps should have to get configured in Grafana. - labels: - grafana_dashboard: "1" + labels: {} # -- Annotations that ConfigMaps can have to get configured in Grafana. annotations: {}