Merge pull request #1579 from Altinity/0.24.1

Altinity · Dec 2, 2024 · adab0c8 · adab0c8
2 parents d7ecc2e + 152a4a5
commit adab0c8
Show file tree

Hide file tree

Showing 223 changed files with 9,813 additions and 2,075 deletions.
diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml
@@ -74,7 +74,7 @@ jobs:
           echo "  test mode: ${{ github.event.inputs.test_mode }}"
           echo "  test mask: ${{ github.event.inputs.test_mask }}"
           echo
-        
+
           source ~/venv/qa/bin/activate
           set -x
           set +e # disable the "exit on failure"
@@ -121,7 +121,7 @@ jobs:
           retention-days: 90
 
       - name: Test Failed
-        if: ${{ steps.vars.outputs.test_result != '0' }}
+        if: ${{ failure() }}
         uses: actions/github-script@v3
         with:
           script: |

diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,7 @@
 # Skip logs and caches
 log
 *.log
+*.log.txt
 __pycache__
 
 # Skip dev runtime-produced

diff --git a/Vagrantfile b/Vagrantfile
@@ -18,7 +18,7 @@ end
 
 
 Vagrant.configure(2) do |config|
-  config.vm.box = "generic/ubuntu2004"
+  config.vm.box = "generic/ubuntu2404"
   config.vm.box_check_update = false
 
   if get_provider == "hyperv"
@@ -111,7 +111,7 @@ Vagrant.configure(2) do |config|
     apt-get install --no-install-recommends -y clickhouse-client
 
     # golang
-    export GOLANG_VERSION=1.19
+    export GOLANG_VERSION=1.23
     apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F6BC817356A3D45E
     add-apt-repository ppa:longsleep/golang-backports
     apt-get install --no-install-recommends -y golang-${GOLANG_VERSION}-go
@@ -148,7 +148,8 @@ Vagrant.configure(2) do |config|
     # MINIKUBE_VERSION=1.19.0
     # MINIKUBE_VERSION=1.20.0
     # MINIKUBE_VERSION=1.23.2
-    MINIKUBE_VERSION=1.28.0
+    # MINIKUBE_VERSION=1.28.0
+    MINIKUBE_VERSION=1.34.0
     wget -c --progress=bar:force:noscroll -O /usr/local/bin/minikube https://github.com/kubernetes/minikube/releases/download/v${MINIKUBE_VERSION}/minikube-linux-amd64
     chmod +x /usr/local/bin/minikube
     # required for k8s 1.18+
@@ -168,7 +169,8 @@ Vagrant.configure(2) do |config|
 #    K8S_VERSION=${K8S_VERSION:-1.22.5}
 #    K8S_VERSION=${K8S_VERSION:-1.23.1}
 #    K8S_VERSION=${K8S_VERSION:-1.24.8}
-    K8S_VERSION=${K8S_VERSION:-1.25.4}
+#    K8S_VERSION=${K8S_VERSION:-1.25.4}
+    K8S_VERSION=${K8S_VERSION:-1.31.1}
     export VALIDATE_YAML=true
 
     killall kubectl || true

diff --git a/config/chk/keeper_config.d/01-keeper-01-default-config.xml b/config/chk/keeper_config.d/01-keeper-01-default-config.xml
@@ -17,7 +17,6 @@
         <snapshot_storage_path>/var/lib/clickhouse-keeper/coordination/snapshots</snapshot_storage_path>
         <storage_path>/var/lib/clickhouse-keeper</storage_path>
         <tcp_port>2181</tcp_port>
-        <enable_reconfiguration>true</enable_reconfiguration>
     </keeper_server>
     <listen_host>::</listen_host>
     <listen_host>0.0.0.0</listen_host>

diff --git a/config/chk/keeper_config.d/01-keeper-03-enable-reconfig.xml b/config/chk/keeper_config.d/01-keeper-03-enable-reconfig.xml
@@ -0,0 +1,11 @@
+<!-- IMPORTANT -->
+<!-- This file is auto-generated -->
+<!-- Do not edit this file - all changes would be lost -->
+<!-- Edit appropriate template in the following folder: -->
+<!-- deploy/builder/templates-config -->
+<!-- IMPORTANT -->
+<clickhouse>
+    <keeper_server>
+        <enable_reconfiguration>false</enable_reconfiguration>
+    </keeper_server>
+</clickhouse>
diff --git a/config/config-dev.yaml b/config/config-dev.yaml
@@ -351,6 +351,27 @@ label:
   #  LabelClusterScopeCycleOffset
   appendScope: "no"
 
+################################################
+##
+## Metrics management section
+##
+################################################
+metrics:
+  labels:
+    exclude: []
+
+################################################
+##
+## Status management section
+##
+################################################
+status:
+  fields:
+    action: false
+    actions: false
+    error: false
+    errors: false
+
 ################################################
 ##
 ## StatefulSet management section

diff --git a/config/config.yaml b/config/config.yaml
@@ -147,7 +147,6 @@ clickhouse:
     # These credentials are used for:
     #   1. Metrics requests
     #   2. Schema maintenance
-    #   3. DROP DNS CACHE
     # User with these credentials can be specified in additional ClickHouse .xml config files,
     # located in 'clickhouse.configuration.file.path.user' folder
     username: ""
@@ -351,6 +350,27 @@ label:
   #  LabelClusterScopeCycleOffset
   appendScope: "no"
 
+################################################
+##
+## Metrics management section
+##
+################################################
+metrics:
+  labels:
+    exclude: []
+
+################################################
+##
+## Status management section
+##
+################################################
+status:
+  fields:
+    action: false
+    actions: false
+    error: false
+    errors: false
+
 ################################################
 ##
 ## StatefulSet management section

diff --git a/deploy/builder/templates-config/chk/keeper_config.d/01-keeper-01-default-config.xml b/deploy/builder/templates-config/chk/keeper_config.d/01-keeper-01-default-config.xml
@@ -11,7 +11,6 @@
         <snapshot_storage_path>/var/lib/clickhouse-keeper/coordination/snapshots</snapshot_storage_path>
         <storage_path>/var/lib/clickhouse-keeper</storage_path>
         <tcp_port>2181</tcp_port>
-        <enable_reconfiguration>true</enable_reconfiguration>
     </keeper_server>
     <listen_host>::</listen_host>
     <listen_host>0.0.0.0</listen_host>

diff --git a/deploy/builder/templates-config/chk/keeper_config.d/01-keeper-03-enable-reconfig.xml b/deploy/builder/templates-config/chk/keeper_config.d/01-keeper-03-enable-reconfig.xml
@@ -0,0 +1,5 @@
+<clickhouse>
+    <keeper_server>
+        <enable_reconfiguration>false</enable_reconfiguration>
+    </keeper_server>
+</clickhouse>
diff --git a/deploy/builder/templates-config/config.yaml b/deploy/builder/templates-config/config.yaml
@@ -141,7 +141,6 @@ clickhouse:
     # These credentials are used for:
     #   1. Metrics requests
     #   2. Schema maintenance
-    #   3. DROP DNS CACHE
     # User with these credentials can be specified in additional ClickHouse .xml config files,
     # located in 'clickhouse.configuration.file.path.user' folder
     username: "${CH_USERNAME_PLAIN}"
@@ -345,6 +344,27 @@ label:
   #  LabelClusterScopeCycleOffset
   appendScope: "no"
 
+################################################
+##
+## Metrics management section
+##
+################################################
+metrics:
+  labels:
+    exclude: []
+
+################################################
+##
+## Status management section
+##
+################################################
+status:
+  fields:
+    action: false
+    actions: false
+    error: false
+    errors: false
+
 ################################################
 ##
 ## StatefulSet management section

diff --git a/...-install-bundle/clickhouse-operator-install-yaml-template-01-section-crd-01-chi-chit.yaml b/...-install-bundle/clickhouse-operator-install-yaml-template-01-section-crd-01-chi-chit.yaml
@@ -1087,7 +1087,7 @@ spec:
                             description: "template name, could use to link inside top-level `chi.spec.defaults.templates.podTemplate`, cluster-level `chi.spec.configuration.clusters.templates.podTemplate`, shard-level `chi.spec.configuration.clusters.layout.shards.temlates.podTemplate`, replica-level `chi.spec.configuration.clusters.layout.replicas.templates.podTemplate`"
                           generateName:
                             type: string
-                            description: "allows define format for generated `Pod` name, look to https://github.com/Altinity/clickhouse-operator/blob/master/docs/custom_resource_explained.md#spectemplatesservicetemplates for details about aviailable template variables"
+                            description: "allows define format for generated `Pod` name, look to https://github.com/Altinity/clickhouse-operator/blob/master/docs/custom_resource_explained.md#spectemplatesservicetemplates for details about available template variables"
                           zone:
                             type: object
                             description: "allows define custom zone name and will separate ClickHouse `Pods` between nodes, shortcut for `chi.spec.templates.podTemplates.spec.affinity.podAntiAffinity`"
@@ -1235,7 +1235,7 @@ spec:
                             description: |
                               allows define format for generated `Service` name,
                               look to https://github.com/Altinity/clickhouse-operator/blob/master/docs/custom_resource_explained.md#spectemplatesservicetemplates
-                              for details about aviailable template variables"
+                              for details about available template variables"
                           metadata:
                             # TODO specify ObjectMeta
                             type: object

diff --git a/...-install-bundle/clickhouse-operator-install-yaml-template-01-section-crd-02-chopconf.yaml b/...-install-bundle/clickhouse-operator-install-yaml-template-01-section-crd-02-chopconf.yaml
@@ -374,6 +374,40 @@ spec:
                         - "LabelClusterScopeCycleSize"
                         - "LabelClusterScopeCycleIndex"
                         - "LabelClusterScopeCycleOffset"
+                metrics:
+                  type: object
+                  description: "defines metrics exporter options"
+                  properties:
+                    labels:
+                      type: object
+                      description: "defines metric labels options"
+                      properties:
+                        exclude:
+                          type: array
+                          description: |
+                            When adding labels to a metric exclude labels with names from the following list
+                          items:
+                            type: string
+                status:
+                  type: object
+                  description: "defines status options"
+                  properties:
+                    fields:
+                      type: object
+                      description: "defines status fields options"
+                      properties:
+                        action:
+                          <<: *TypeStringBool
+                          description: "Whether the operator should fill status field 'action'"
+                        actions:
+                          <<: *TypeStringBool
+                          description: "Whether the operator should fill status field 'actions'"
+                        error:
+                          <<: *TypeStringBool
+                          description: "Whether the operator should fill status field 'error'"
+                        errors:
+                          <<: *TypeStringBool
+                          description: "Whether the operator should fill status field 'errors'"
                 statefulSet:
                   type: object
                   description: "define StatefulSet-specific parameters"

diff --git a/...lates-install-bundle/clickhouse-operator-install-yaml-template-01-section-crd-03-chk.yaml b/...lates-install-bundle/clickhouse-operator-install-yaml-template-01-section-crd-03-chk.yaml
@@ -671,7 +671,7 @@ spec:
                             description: "template name, could use to link inside top-level `chi.spec.defaults.templates.podTemplate`, cluster-level `chi.spec.configuration.clusters.templates.podTemplate`, shard-level `chi.spec.configuration.clusters.layout.shards.temlates.podTemplate`, replica-level `chi.spec.configuration.clusters.layout.replicas.templates.podTemplate`"
                           generateName:
                             type: string
-                            description: "allows define format for generated `Pod` name, look to https://github.com/Altinity/clickhouse-operator/blob/master/docs/custom_resource_explained.md#spectemplatesservicetemplates for details about aviailable template variables"
+                            description: "allows define format for generated `Pod` name, look to https://github.com/Altinity/clickhouse-operator/blob/master/docs/custom_resource_explained.md#spectemplatesservicetemplates for details about available template variables"
                           zone:
                             type: object
                             description: "allows define custom zone name and will separate ClickHouse `Pods` between nodes, shortcut for `chi.spec.templates.podTemplates.spec.affinity.podAntiAffinity`"
@@ -819,7 +819,7 @@ spec:
                             description: |
                               allows define format for generated `Service` name,
                               look to https://github.com/Altinity/clickhouse-operator/blob/master/docs/custom_resource_explained.md#spectemplatesservicetemplates
-                              for details about aviailable template variables"
+                              for details about available template variables"
                           metadata:
                             # TODO specify ObjectMeta
                             type: object

diff --git a/deploy/helm/clickhouse-operator/Chart.yaml b/deploy/helm/clickhouse-operator/Chart.yaml
@@ -10,10 +10,11 @@ description: |-
     kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml
     kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml
     kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml
+    kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhousekeeperinstallations.clickhouse-keeper.altinity.com.yaml
   ```
 type: application
-version: 0.24.0
-appVersion: 0.24.0
+version: 0.24.1
+appVersion: 0.24.1
 home: https://github.com/Altinity/clickhouse-operator
 icon: https://logosandtypes.com/wp-content/uploads/2020/12/altinity.svg
 maintainers: