chore(clickhouse): change to use shard0 keeper cluster

Author: EamonZhang

addons/clickhouse/24/chart/clickhouse/README.md

@@ -475,4 +475,7 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.
+
+
+https://github.com/ClickHouse/ClickHouse/pull/62366/

addons/clickhouse/24/chart/clickhouse/templates/statefulset.yaml

@@ -238,6 +238,8 @@ spec:
             {{- range $j, $r := until $replicas }}
             - name: {{ printf "KEEPER_NODE_%d" $j }}
               value: {{ printf "%s-shard%d-%d.%s.%s.svc.%s" (include "common.names.fullname" $ ) $i $j (include "clickhouse.headlessServiceName" $) (include "common.names.namespace" $) $.Values.clusterDomain }}
+            - name: {{ printf "ZOOKEEPER_NODE_%d" $j }}
+              value: {{ printf "%s-shard%d-%d.%s.%s.svc.%s" (include "common.names.fullname" $ ) 0 $j (include "clickhouse.headlessServiceName" $) (include "common.names.namespace" $) $.Values.clusterDomain }}
             {{- end }}
             {{- else if $.Values.zookeeper.enabled }}
             {{- $replicas := $.Values.zookeeper.replicaCount | int }}

addons/clickhouse/24/chart/clickhouse/values.yaml

@@ -284,7 +284,7 @@ defaultConfigurationOverrides: |
     {{- if or (ne (int .Values.shards) 1) (ne (int .Values.replicaCount) 1)}}
     <!-- Cluster configuration - Any update of the shards and replicas requires helm upgrade -->
     <remote_servers>
-      <default>
+      <cluster>
         {{- $shards := $.Values.shards | int }}
         {{- range $shard, $e := until $shards }}
         <shard>
@@ -299,7 +299,7 @@ defaultConfigurationOverrides: |
             {{- end }}
         </shard>
         {{- end }}
-      </default>
+      </cluster>
     </remote_servers>
     {{- end }}
     {{- if .Values.keeper.enabled }}
@@ -339,7 +339,7 @@ defaultConfigurationOverrides: |
       {{- $nodes := .Values.replicaCount | int }}
       {{- range $node, $e := until $nodes }}
       <node>
-        <host from_env="{{ printf "KEEPER_NODE_%d" $node }}"></host>
+        <host from_env="{{ printf "ZOOKEEPER_NODE_%d" $node }}"></host>
         <port>{{ $.Values.service.ports.keeper }}</port>
       </node>
       {{- end }}

addons/clickhouse/24/meta.yaml

@@ -21,4 +21,10 @@ allow_parameters:
 - name: "service.type"
   required: false
   description: "service type config for values.yaml"
+- name: "shards"
+  required: false
+  description: "service type config for values.yaml"
+- name: "replicaCount"
+  required: false
+  description: "service type config for values.yaml"
 archive: false

addons/clickhouse/24/plans/standard-16c64g1000/bind.yaml

@@ -0,0 +1,24 @@
+credential:
+{{- if (eq .Values.service.type "LoadBalancer") }}
+  - name: {{ printf "EXTRANET_HOST" }}
+    valueFrom:
+      serviceRef:
+        name: {{ include "common.names.fullname" . }}
+        jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
+{{- end }}
+  - name: {{ printf "HOST" }}
+    valueFrom:
+      serviceRef:
+        name: {{ include "common.names.fullname" . }}
+        jsonpath: '{ .spec.clusterIP }'
+  - name: PASSWORD
+    valueFrom:
+      secretKeyRef:
+        name: {{ template "common.names.fullname" . }}
+        jsonpath: '{ .data.admin-password }' 
+  - name: USERNAME
+    value: '{{ .Values.auth.username }}'
+  - name: TCP_PORT
+    value: 9000
+  - name: HTTP_PORT
+    value: 8123

addons/clickhouse/24/plans/standard-16c64g1000/create-instance-schema.json

@@ -0,0 +1,12 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "imagePullPolicy": {
+      "type": "string",
+      "enum": ["Always", "IfNotPresent", "Never"],
+      "default": "IfNotPresent",
+      "title": "Image pull policy"
+    }
+  }
+}

addons/clickhouse/24/plans/standard-16c64g1000/meta.yaml

@@ -0,0 +1,6 @@
+name: "standard-16c64g1000"
+id: 6447a8c0-ab6c-4afd-8d1b-fe3be3ecfa3f
+description: "clickhouse standard-16c64g1000 plan: Disk 1000Gi ,vCPUs 16 , RAM 64G "
+displayName: "standard-16c64g1000"
+bindable: true
+maximum_polling_duration: 1800

addons/clickhouse/24/plans/standard-16c64g1000/values.yaml

@@ -0,0 +1,23 @@
+## @param fullnameOverride String to fully override common.names.fullname template
+##
+fullnameOverride: hb-clickhouse-cluster-standard-16c64g1000
+
+## MinIO® containers' resource requests and limits
+## ref: https://kubernetes.io/docs/user-guide/compute-resources/
+## We usually recommend not to specify default resources and to leave this as a conscious
+## choice for the user. This also increases chances charts run on environments with little
+## resources, such as Minikube. If you do want to specify resources, uncomment the following
+## lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+## @param resources.limits The resources limits for the MinIO® container
+## @param resources.requests The requested resources for the MinIO® container
+##
+resources:
+  limits:
+    cpu: 16000m
+    memory: 64Gi
+  requests:
+    cpu: 16000m
+    memory: 64Gi
+
+persistence:
+  size: 1000Gi

addons/clickhouse/24/plans/standard-2c4g20/bind.yaml

@@ -22,5 +22,3 @@ credential:
     value: 9000
   - name: HTTP_PORT
     value: 8123
-  - name: MYSQL_PORT
-    value: 9004

addons/clickhouse/24/plans/standard-4c16g100/bind.yaml

@@ -21,6 +21,4 @@ credential:
   - name: TCP_PORT
     value: 9000
   - name: HTTP_PORT
-    value: 8123
-  - name: MYSQL_PORT
-    value: 9004
+    value: 8123