feat: improve ck sharding restore (pick #2339) (#2357)

Co-authored-by: loomts <loomts@users.noreply.github.com>

Author: loomts

.github/CODEOWNERS

@@ -10,8 +10,8 @@ examples/ @ahjing99 @shanshanying @leon-inf @apecloud/kb-reviewers @apecloud/kb-
 addons/apecloud-mysql/ @xuriwuyun @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers
 addons-cluster/apecloud-mysql/ @xuriwuyun @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers
 
-addons/clickhouse/ @sophon-zt @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers
-addons-cluster/clickhouse/ @sophon-zt @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers
+addons/clickhouse/ @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers
+addons-cluster/clickhouse/ @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers
 
 addons/elasticsearch/ @iziang @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers
 addons-cluster/elasticsearch/ @iziang @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers
@@ -112,8 +112,8 @@ addons-cluster/tidb/ @csuzhangxc @cjc7373 @leon-inf @apecloud/kb-reviewers @apec
 addons/vanilla-postgresql/ @kizuna-lek @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers
 addons-cluster/vanilla-postgresql/ @kizuna-lek @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers
 
-addons/victoria-metrics/ @sophon-zt @ButterBright @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers
-addons-cluster/victoria-metrics/ @sophon-zt @ButterBright @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers
+addons/victoria-metrics/ @ButterBright @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers
+addons-cluster/victoria-metrics/ @ButterBright @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers
 
 addons/weaviate/ @iziang @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers
 addons-cluster/weaviate/ @iziang @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers

README.md

@@ -8,7 +8,7 @@ KubeBlocks add-ons.
 | ---- | ---- | ----------- | ----------- |
 | apecloud-mysql | apecloud-mysql-8.0.30<br>wescale-0.2.7 | ApeCloud MySQL is a database that is compatible with MySQL syntax and achieves high availability through the utilization of the RAFT consensus protocol. | xuriwuyun |
 | apecloud-postgresql |  | ApeCloud PostgreSQL is a database that is compatible with PostgreSQL syntax and achieves high availability through the utilization of the RAFT consensus protocol. | ldming |
-| clickhouse | clickhouse-22.3.18<br>clickhouse-22.3.20<br>clickhouse-22.8.21<br>clickhouse-24.8.3<br>clickhouse-25.4.4 | ClickHouse is an open-source column-oriented OLAP database management system. Use it to boost your database performance while providing linear scalability and hardware efficiency. | sophon-zt |
+| clickhouse | clickhouse-22.3.18<br>clickhouse-22.3.20<br>clickhouse-22.8.21<br>clickhouse-24.8.3<br>clickhouse-25.4.4<br>clickhouse-25.9.7 | ClickHouse is an open-source column-oriented OLAP database management system. Use it to boost your database performance while providing linear scalability and hardware efficiency. | ApeCloud |
 | elasticsearch | elasticsearch-6.8.23<br>elasticsearch-7.10.1<br>elasticsearch-7.10.2<br>elasticsearch-7.7.1<br>elasticsearch-7.8.1<br>elasticsearch-8.1.3<br>elasticsearch-8.15.5<br>elasticsearch-8.8.2<br>kibana-6.8.23<br>kibana-7.10.1<br>kibana-7.10.2<br>kibana-7.7.1<br>kibana-7.8.1<br>kibana-8.1.3<br>kibana-8.15.5<br>kibana-8.8.2<br>kibana-8.9.1 | Elasticsearch is a distributed, RESTful search engine optimized for speed and relevance on production-scale workloads. | iziang vipshop |
 | etcd | etcd-3.5.15<br>etcd-3.5.6<br>etcd-3.6.1 | Etcd is a strongly consistent, distributed key-value store that provides a reliable way to store data that needs to be accessed by a distributed system or cluster of machines. | ApeCloud |
 | greptimedb | greptimedb-0.3.2 | An open-source, cloud-native, distributed time-series database with PromQL/SQL/Python supported. | GreptimeTeam sh2 |
@@ -41,7 +41,7 @@ KubeBlocks add-ons.
 | tdengine | tdengine-3.3.6-9 | TDengine is an open source, high-performance, cloud native time-series database optimized for Internet of Things (IoT), Connected Cars, Industrial IoT and DevOps. | leon-inf |
 | tidb | tidb-6.5.12<br>tidb-7.1.5<br>tidb-7.5.2<br>tidb-8.4.0<br>tidb-pd-6.5.12<br>tidb-pd-7.1.5<br>tidb-pd-7.5.2<br>tidb-pd-8.4.0<br>tikv-6.5.12<br>tikv-7.1.5<br>tikv-7.5.2<br>tikv-8.4.0 | TiDB is an open-source, cloud-native, distributed, MySQL-Compatible database for elastic scale and real-time analytics. | csuzhangxc cjc7373 |
 | vanilla-postgresql | supabase-15.6.1-138<br>anilla-postgresql-12.15.0<br>anilla-postgresql-14.7.0<br>anilla-postgresql-15.7.0 | Vanilla-PostgreSQL is compatible with the native PostgreSQL kernel, enabling it to quickly provide HA solutions for various variants based on the native PostgreSQL kernel. | kizuna-lek |
-| victoria-metrics | ictoria-metrics-1.0.0 | VictoriaMetrics is a fast, cost-effective and scalable monitoring solution and time series database. | sophon-zt ButterBright |
+| victoria-metrics | ictoria-metrics-1.0.0 | VictoriaMetrics is a fast, cost-effective and scalable monitoring solution and time series database. | ApeCloud ButterBright |
 | weaviate | weaviate-1.19.6 | Weaviate is an open-source vector database. It allows you to store data objects and vector embeddings from your favorite ML-models, and scale seamlessly into billions of data objects. | iziang |
 | xinference | xinference-0.11.0<br>xinference-0.11.0-cpu<br>xinference-1.13.0<br>xinference-1.13.0-cpu | Xorbits Inference(Xinference) is a powerful and versatile library designed to serve language, speech recognition, and multimodal models. | ApeCloud |
 | yashandb | yashandb-23.1.1-100 | YashanDB is a new database system completely independently designed and developed by SICS. Based on classical database theories, it incorporates original Bounded Evaluation theory, Approximation theory, Parallel Scalability theory and Cross-Modal Fusion Computation theory, supports multiple deployment methods such as stand-alone/primary-standby, shared cluster, and distributed ones, covers OLTP/HTAP/OLAP transactions and analyzes mixed load scenarios, and is fully compatible with privatization and cloud infrastructure, providing clients with one-stop enterprise-level converged data management solutions to meet the needs of key industries such as finance, government, telecommunications and energy for high performance, concurrency and security. | JesseAtSZ shanshanying |

addons-cluster/clickhouse/Chart.yaml

@@ -6,7 +6,7 @@ type: application
 
 version: 1.0.2
 
-appVersion: 25.4.4
+appVersion: 25.9.7
 
 dependencies:
   - name: kblib

addons-cluster/clickhouse/templates/_helpers.tpl

@@ -87,34 +87,6 @@ issuer:
 {{- end }}
 {{- end }}
 
-{{/*
-Define clickhouse componentSpec with ComponentDefinition.
-*/}}
-{{- define "clickhouse-component" -}}
-- name: clickhouse
-  componentDef: {{ include "clickhouse-cluster.cmpdName" . }}
-  replicas: {{ $.Values.replicas | default 2 }}
-  disableExporter: {{ $.Values.disableExporter | default "false" }}
-  serviceVersion: {{ $.Values.version }}
-  services:
-  - name: default
-    serviceType: {{ .Values.service.type | default "NodePort" }}
-  systemAccounts:
-    - name: admin
-      passwordConfig:
-        length: 10
-        numDigits: 5
-        numSymbols: 0
-        letterCase: MixedCases
-        seed: {{ include "kblib.clusterName" . }}
-  {{- with $.Values.tolerations }}
-  tolerations: {{ .| toYaml | nindent 4 }}
-  {{- end }}
-  {{- include "kblib.componentResources" . | indent 2 }}
-  {{- include "kblib.componentStorages" . | indent 2 }}
-  {{- include "clickhouse-cluster.tls" . | indent 2 }}
-{{- end }}
-
 {{/*
 Define clickhouse keeper componentSpec with ComponentDefinition.
 */}}
@@ -191,33 +163,4 @@ Define clickhouse shardingComponentSpec with ComponentDefinition.
     {{- include "kblib.componentResources" . | indent 4 }}
     {{- include "kblib.componentStorages" . | indent 4 }}
     {{- include "clickhouse-cluster.tls" . | indent 4 }}
-{{- end }}
-
-{{/*
-Define clickhouse componentSpec with compatible ComponentDefinition API
-*/}}
-{{- define "clickhouse-nosharding-component" -}}
-{{- range $i := until (.Values.shards | int) }}
-{{- $name := printf "clickhouse-%d" $i }}
-{{- if eq $i 0 }}
-{{- $name = "clickhouse" }}
-{{- end}}
-- name: {{ $name }}
-  env:
-  - name: "INIT_CLUSTER_NAME"
-    value: "{{ .Values.clickhouse.initClusterName }}"
-  componentDef: {{ include "clickhouse-cluster.cmpdName" . }}
-  replicas: {{ $.Values.replicas | default 2 }}
-  disableExporter: {{ $.Values.disableExporter | default "false" }}
-  serviceVersion: {{ $.Values.version }}
-  {{- with $.Values.tolerations }}
-  tolerations: {{ .| toYaml | nindent 4 }}
-  services:
-  - name: default
-    serviceType: {{ .Values.service.type | default "NodePort" }}
-  {{- end }}
-  {{- include "kblib.componentResources" $ | indent 2 }}
-  {{- include "kblib.componentStorages" $ | indent 2 }}
-  {{- include "clickhouse-cluster.tls" $ | indent 2 }}
-{{- end }}
 {{- end }}

addons-cluster/clickhouse/templates/cluster.yaml

@@ -5,9 +5,5 @@
   {{- if eq .Values.mode "cluster" }}
   {{- include "clickhouse-keeper-component" . | nindent 4 }}
   {{- end }}
-  {{- if not .Values.sharding }}
-  {{- include "clickhouse-nosharding-component" . | nindent 4 }}
-  {{- else }}
   shardings:
-  {{- include "clickhouse-sharding-component" . | nindent 4 }}
-  {{- end }}
+  {{- include "clickhouse-sharding-component" . | nindent 4 }}

addons-cluster/clickhouse/values.yaml

@@ -4,16 +4,15 @@ nameOverride: ""
 fullnameOverride: ""
 
 ## Clickhouse cluster version
-version: 24.8.3
+version: 25.9.7
 
 ## ClickHouse cluster topology mode defined in ClusterDefinition.Spec.topologies, support standalone and cluster
 ## - `standalone`: single clickhouse instance
 ## - `cluster`: clickhouse with ClickHouse Keeper as coordinator
 mode: cluster
 
 ## Sharding configuration
-shards: 1
-sharding: true
+shards: 2
 
 ## Number of ClickHouse replicas per shard to deploy
 replicas: 2

addons/clickhouse/Chart.yaml

@@ -8,7 +8,7 @@ type: application
 
 version: 1.0.2
 
-appVersion: 25.4.4
+appVersion: 25.9.7
 
 home: https://clickhouse.com/
 icon: https://bitnami.com/assets/stacks/clickhouse/img/clickhouse-stack-220x234.png
@@ -17,8 +17,8 @@ keywords:
 - sharding
 
 maintainers:
-  - name: sophon-zt
-    url: https://github.com/apecloud/kubeblocks/
+  - name: ApeCloud
+    url: https://kubeblocks.io/
 
 dependencies:
   - name: kblib