move grafana_folder to annotations, simplify values.schema.json, fix #1875

Signed-off-by: Slach <[email protected]>

Author: Slach

deploy/helm/clickhouse-operator/values.schema.json

@@ -640,12 +640,7 @@
             "properties": {
                 "additionalLabels": {
                     "description": "labels to add to a secret with dashboards",
-                    "type": "object",
-                    "properties": {
-                        "grafana_dashboard": {
-                            "type": "string"
-                        }
-                    }
+                    "type": "object"
                 },
                 "annotations": {
                     "description": "annotations to add to a secret with dashboards",
@@ -654,9 +649,6 @@
                 "enabled": {
                     "description": "provision grafana dashboards as configMaps (can be synced by grafana dashboards sidecar https://github.com/grafana/helm-charts/blob/grafana-8.3.4/charts/grafana/values.yaml#L778 )",
                     "type": "boolean"
-                },
-                "grafana_folder": {
-                    "type": "string"
                 }
             }
         },

deploy/helm/clickhouse-operator/values.yaml

@@ -897,7 +897,9 @@ dashboards:
   enabled: false
   # dashboards.additionalLabels -- labels to add to a secret with dashboards
   additionalLabels:
+    # dashboards.additionalLabels.grafana_dashboard - will watch when official grafana helm chart sidecar.dashboards.enabled=true
     grafana_dashboard: ""
   # dashboards.annotations -- annotations to add to a secret with dashboards
-  annotations: {}
-  grafana_folder: clickhouse
+  annotations:
+    # dashboards.annotations.grafana_folder -- folder where will place dashboards, requires define values in official grafana helm chart sidecar.dashboards.folderAnnotation: grafana_folder
+    grafana_folder: clickhouse-operator