Merge pull request #1761 from Altinity/0.25.1

0.25.1

Author: sunsingerus

deploy/builder/templates-install-bundle/clickhouse-operator-install-yaml-template-01-section-crd-01-chi-chit.yaml

@@ -447,7 +447,49 @@ spec:
                           minimum: 0
                           maximum: 100
                           description: "The maximum percentage of cluster shards that may be reconciled in parallel, 50 percent by default."
-
+                    macros:
+                      type: object
+                      description: "macros parameters"
+                      properties:
+                        sections:
+                          type: object
+                          description: "sections behaviour for macros"
+                          properties:
+                            users:
+                              type: object
+                              description: "sections behaviour for macros on users"
+                              properties:
+                                enabled:
+                                  <<: *TypeStringBool
+                                  description: "enabled or not"
+                            profiles:
+                              type: object
+                              description: "sections behaviour for macros on profiles"
+                              properties:
+                                enabled:
+                                  <<: *TypeStringBool
+                                  description: "enabled or not"
+                            quotas:
+                              type: object
+                              description: "sections behaviour for macros on quotas"
+                              properties:
+                                enabled:
+                                  <<: *TypeStringBool
+                                  description: "enabled or not"
+                            settings:
+                              type: object
+                              description: "sections behaviour for macros on settings"
+                              properties:
+                                enabled:
+                                  <<: *TypeStringBool
+                                  description: "enabled or not"
+                            files:
+                              type: object
+                              description: "sections behaviour for macros on files"
+                              properties:
+                                enabled:
+                                  <<: *TypeStringBool
+                                  description: "enabled or not"
                 defaults:
                   type: object
                   description: |
@@ -642,7 +684,7 @@ spec:
                         every key in this object is the file name
                         every value in this object is the file content
                         you can use `!!binary |` and base64 for binary files, see details here https://yaml.org/type/binary.html
-                        each key could contains prefix like {users}, {common}, {host} or config.d, users.d, cond.d, wrong prefixes will ignored, subfolders also will ignored
+                        each key could contains prefix like {common}, {users}, {hosts} or config.d, users.d, conf.d, wrong prefixes will be ignored, subfolders also will be ignored
                         More details: https://github.com/Altinity/clickhouse-operator/blob/master/docs/chi-examples/05-settings-05-files-nested.yaml
 
                         any key could contains `valueFrom` with `secretKeyRef` which allow pass values from kubernetes secrets
@@ -765,6 +807,24 @@ spec:
                               by specifying 0. This is a mutually exclusive setting with "minAvailable".
                             minimum: 0
                             maximum: 65535
+                          reconcile:
+                            type: object
+                            description: "allow tuning reconciling process"
+                            properties:
+                              runtime:
+                                type: object
+                                description: "runtime parameters for clickhouse-operator process which are used during reconcile cycle"
+                                properties:
+                                  reconcileShardsThreadsNumber:
+                                    type: integer
+                                    minimum: 1
+                                    maximum: 65535
+                                    description: "How many goroutines will be used to reconcile shards of a cluster in parallel, 1 by default"
+                                  reconcileShardsMaxConcurrencyPercent:
+                                    type: integer
+                                    minimum: 0
+                                    maximum: 100
+                                    description: "The maximum percentage of cluster shards that may be reconciled in parallel, 50 percent by default."
                           layout:
                             type: object
                             description: |
@@ -1011,24 +1071,6 @@ spec:
                                             description: |
                                               optional, configuration of the templates names which will use for generate Kubernetes resources according to selected replica
                                               override top-level `chi.spec.configuration.templates`, cluster-level `chi.spec.configuration.clusters.templates`, replica-level `chi.spec.configuration.clusters.layout.replicas.templates`
-                          reconcile:
-                            type: object
-                            description: "allow tuning reconciling process"
-                            properties:
-                              runtime:
-                                type: object
-                                description: "runtime parameters for clickhouse-operator process which are used during reconcile cycle"
-                                properties:
-                                  reconcileShardsThreadsNumber:
-                                    type: integer
-                                    minimum: 1
-                                    maximum: 65535
-                                    description: "How many goroutines will be used to reconcile shards of a cluster in parallel, 1 by default"
-                                  reconcileShardsMaxConcurrencyPercent:
-                                    type: integer
-                                    minimum: 0
-                                    maximum: 100
-                                    description: "The maximum percentage of cluster shards that may be reconciled in parallel, 50 percent by default."
                 templates:
                   type: object
                   description: "allows define templates which will use for render Kubernetes resources like StatefulSet, ConfigMap, Service, PVC, by default, clickhouse-operator have own templates, but you can override it"

deploy/grafana/grafana-with-grafana-operator/grafana-cr-template.yaml

@@ -1,43 +1,47 @@
 ---
-apiVersion: integreatly.org/v1alpha1
+apiVersion: grafana.integreatly.org/v1beta1
 kind: Grafana
 metadata:
   name: "$GRAFANA_NAME"
+  labels:
+    app: grafana
 spec:
   deployment:
-    annotations:
-      cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
-    securityContext:
-      fsGroup: 472
-  ingress:
-    enabled: False
-#  baseImage: "grafana/grafana:9.3.6"
-  dataStorage:
-    size: 1Gi
-    accessModes:
-      - ReadWriteOnce
+    metadata:
+      annotations:
+        cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
+      labels:
+        app: grafana
+
+  persistentVolumeClaim:
+    spec:
+      resources:
+        requests:
+          storage: 1G
+      accessModes:
+        - ReadWriteOnce
+
   client:
     timeout: 30
-    preferService: True
+    preferIngress: False
   config:
     log:
       mode: "console"
-      level: "warn"
+      level: "debug"
     security:
       admin_user: "$GRAFANA_ADMIN_USER"
       admin_password: "$GRAFANA_ADMIN_PASSWORD"
     auth:
-      disable_login_form: $GRAFANA_DISABLE_LOGIN_FORM
-      disable_signout_menu: $GRAFANA_DISABLE_SIGNOUT_MENU
+      disable_login_form: "$GRAFANA_DISABLE_LOGIN_FORM"
+      disable_signout_menu: "$GRAFANA_DISABLE_SIGNOUT_MENU"
     # required for Dashboard Installation - https://github.com/integr8ly/grafana-operator/issues/92
     auth.basic:
-      enabled: True
+      enabled: "True"
     dataproxy:
-      timeout: 600     
+      timeout: "600"
     auth.anonymous:
-      enabled: $GRAFANA_ANONYMOUS_EDITOR
+      enabled: "$GRAFANA_ANONYMOUS_EDITOR"
       org_role: Editor
-
 # look to https://grafana.com/docs/grafana/latest/auth/generic-oauth/
 #    server:
 #      root_url: $GRAFANA_ROOT_URL
@@ -53,7 +57,4 @@ spec:
 #      scopes: openid profile email
 #      auth_url: https://$OAUTH_DOMAIN/authorize
 #      token_url: https://$OAUTH_DOMAIN/oauth/token
-#      api_url: https://$OAUTH_DOMAIN/userinfo
-  dashboardLabelSelector:
-  - matchExpressions:
-    - {key: app, operator: In, values: [grafana]}
+#      api_url: https://$OAUTH_DOMAIN/userinfo

deploy/grafana/grafana-with-grafana-operator/grafana-dashboard-clickhouse-keeper-cr-template.yaml

@@ -1,13 +1,25 @@
-apiVersion: integreatly.org/v1alpha1
+apiVersion: grafana.integreatly.org/v1beta1
 kind: GrafanaDashboard
 metadata:
   name: "$GRAFANA_CLICKHOUSE_KEEPER_DASHBOARD_NAME"
   labels:
     app: grafana
 spec:
+  instanceSelector:
+    matchExpressions:
+      - key: app
+        operator: In
+        values:
+          - grafana
   url: https://raw.githubusercontent.com/Altinity/clickhouse-operator/master/grafana-dashboard/ClickHouseKeeper_dashboard.json
+  resyncPeriod: 24h
   datasources:
     - inputName: "DS_PROMETHEUS"
       datasourceName: "$GRAFANA_PROMETHEUS_DATASOURCE_NAME"
   # look to https://github.com/integr8ly/grafana-operator/issues/416#issuecomment-849498860, json used as fallback
   json: ""
+  plugins:
+    - name: "vertamedia-clickhouse-datasource"
+      version: "3.3.1"
+    - name: "grafana-piechart-panel"
+      version: "1.6.4"

deploy/grafana/grafana-with-grafana-operator/grafana-dashboard-kafka-cr-template.yaml

@@ -1,11 +1,18 @@
-apiVersion: integreatly.org/v1alpha1
+apiVersion: grafana.integreatly.org/v1beta1
 kind: GrafanaDashboard
 metadata:
   name: "$GRAFANA_CLICKHOUSE_KAFKA_DASHBOARD_NAME"
   labels:
     app: grafana
 spec:
+  instanceSelector:
+    matchExpressions:
+      - key: app
+        operator: In
+        values:
+          - grafana
   url: https://raw.githubusercontent.com/Altinity/clickhouse-operator/master/grafana-dashboard/Kafka_dashboard.json
+  resyncPeriod: 24h
   json: ""
   datasources:
     - inputName: "DS_PROMETHEUS"

deploy/grafana/grafana-with-grafana-operator/grafana-dashboard-operator-cr-template.yaml

@@ -1,11 +1,18 @@
-apiVersion: integreatly.org/v1alpha1
+apiVersion: grafana.integreatly.org/v1beta1
 kind: GrafanaDashboard
 metadata:
   name: "$GRAFANA_DASHBOARD_NAME"
   labels:
     app: grafana
 spec:
+  instanceSelector:
+    matchExpressions:
+      - key: app
+        operator: In
+        values:
+          - grafana
   url: https://raw.githubusercontent.com/Altinity/clickhouse-operator/master/grafana-dashboard/Altinity_ClickHouse_Operator_dashboard.json
+  resyncPeriod: 24h
   # look to https://github.com/integr8ly/grafana-operator/issues/416#issuecomment-849498860, json used as fallback
   json: ""
   datasources:

deploy/grafana/grafana-with-grafana-operator/grafana-dashboard-queries-cr-template.yaml

@@ -1,11 +1,18 @@
-apiVersion: integreatly.org/v1alpha1
+apiVersion: grafana.integreatly.org/v1beta1
 kind: GrafanaDashboard
 metadata:
   name: "$GRAFANA_DASHBOARD_NAME"
   labels:
     app: grafana
 spec:
+  instanceSelector:
+    matchExpressions:
+      - key: app
+        operator: In
+        values:
+          - grafana
   url: https://raw.githubusercontent.com/Altinity/clickhouse-operator/master/grafana-dashboard/ClickHouse_Queries_dashboard.json
+  resyncPeriod: 24h
   # look to https://github.com/integr8ly/grafana-operator/issues/416#issuecomment-849498860, json used as fallback
   json: ""
   datasources:

deploy/grafana/grafana-with-grafana-operator/grafana-dashboard-zookeeper-cr-template.yaml

@@ -1,11 +1,18 @@
-apiVersion: integreatly.org/v1alpha1
+apiVersion: grafana.integreatly.org/v1beta1
 kind: GrafanaDashboard
 metadata:
   name: "$GRAFANA_ZOOKEEPER_DASHBOARD_NAME"
   labels:
     app: grafana
 spec:
+  instanceSelector:
+    matchExpressions:
+      - key: app
+        operator: In
+        values:
+          - grafana
   url: https://raw.githubusercontent.com/Altinity/clickhouse-operator/master/grafana-dashboard/Zookeeper_dashboard.json
+  resyncPeriod: 24h
   # look to https://github.com/integr8ly/grafana-operator/issues/416#issuecomment-849498860, json used as fallback
   json: ""
   datasources:

deploy/grafana/grafana-with-grafana-operator/grafana-data-source-clickhouse-cr-template.yaml

@@ -1,25 +1,28 @@
-apiVersion: integreatly.org/v1alpha1
-kind: GrafanaDataSource
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDatasource
 metadata:
   name: "${GRAFANA_CLICKHOUSE_DATASOURCE_NAME}"
 spec:
-  name: ${ENDPOINT}.yaml
-  datasources:
-    - name: "${GRAFANA_CLICKHOUSE_DATASOURCE_NAME}"
-      type: vertamedia-clickhouse-datasource
-      access: proxy
-      url: "${CLICKHOUSE_URL}"
-      basicAuth: false
-      basicAuthUser: "${OPERATOR_CH_USER}"
+  instanceSelector:
+    matchLabels:
+      app: grafana
+  resyncPeriod: 24h
+  datasource:
+    name: "${GRAFANA_CLICKHOUSE_DATASOURCE_NAME}"
+    type: vertamedia-clickhouse-datasource
+    access: proxy
+    url: "${CLICKHOUSE_URL}"
+    basicAuth: false
+    basicAuthUser: "${OPERATOR_CH_USER}"
+    isDefault: false
+    editable: true
+    secureJsonData:
       basicAuthPassword: "${OPERATOR_CH_PASS}"
-      isDefault: false
-      version: 1
-      editable: true
-      jsonData:
-        tlsSkipVerify: true
-        addCorsHeader: true
-        defaultDatabase: "default"
-        usePOST: true
-        useYandexCloudAuthorization: true
-        xHeaderUser: "${OPERATOR_CH_USER}"
-        xHeaderKey: "${OPERATOR_CH_PASS}"
+      xHeaderKey: "${OPERATOR_CH_PASS}"
+    jsonData:
+      tlsSkipVerify: true
+      addCorsHeader: true
+      defaultDatabase: "default"
+      usePOST: true
+      useYandexCloudAuthorization: true
+      xHeaderUser: "${OPERATOR_CH_USER}"

deploy/grafana/grafana-with-grafana-operator/grafana-data-source-prometheus-cr-template.yaml

@@ -1,17 +1,19 @@
-apiVersion: integreatly.org/v1alpha1
-kind: GrafanaDataSource
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDatasource
 metadata:
   name: "$GRAFANA_PROMETHEUS_DATASOURCE_NAME"
 spec:
-  name: ${GRAFANA_PROMETHEUS_DATASOURCE_NAME}.yaml
-  datasources:
-    - name: "${GRAFANA_PROMETHEUS_DATASOURCE_NAME}"
-      type: prometheus
-      access: proxy
-      url: "${PROMETHEUS_URL}"
-      isDefault: true
-      version: 1
-      editable: false
-      jsonData:
-        tlsSkipVerify: true
-        timeInterval: "5s"
+  instanceSelector:
+    matchLabels:
+      app: grafana
+  resyncPeriod: 24h
+  datasource:
+    name: "${GRAFANA_PROMETHEUS_DATASOURCE_NAME}"
+    type: prometheus
+    access: proxy
+    url: "${PROMETHEUS_URL}"
+    isDefault: true
+    editable: false
+    jsonData:
+      tlsSkipVerify: true
+      timeInterval: "5s"