Bug Fix: Corrected schema and docs

Signed-off-by: Itay Grudev <[email protected]>
cloudnative-pg · Mar 23, 2024 · 5f6cf39 · 5f6cf39
1 parent eb44713
commit 5f6cf39
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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: {}