chore: fix keeper cmpd name in cluster (#1160)

Co-authored-by: loomts <[email protected]>
(cherry picked from commit 3858722)

addons-cluster/clickhouse/templates/_helpers.tpl

@@ -107,10 +107,11 @@ Define clickhouse componentSpec with ComponentDefinition.
 {{/*
 Define clickhouse keeper componentSpec with ComponentDefinition.
 */}}
-{{- define "ch-keeper-component" -}}
+{{- define "clickhouse-keeper-component" -}}
 - name: ch-keeper
-  componentDef: ch-keeper-24
+  componentDef: clickhouse-keeper-24
   replicas: {{ .Values.keeper.replicaCount }}
+  disableExporter: {{ $.Values.disableExporter | default "false" }}
   {{- with .Values.keeper.tolerations }}
   tolerations: {{ .| toYaml | nindent 4 }}
   {{- end }}

addons-cluster/clickhouse/templates/cluster.yaml

@@ -5,7 +5,7 @@
 {{- end }}
   componentSpecs:
   {{- if eq .Values.mode "cluster" }}
-  {{- include "ch-keeper-component" . | nindent 4 }}
+  {{- include "clickhouse-keeper-component" . | nindent 4 }}
   {{- end }}
   {{- if eq (.Values.shardCount | int) 1 }}
   {{- include "clickhouse-component" . | nindent 4 }}

addons/clickhouse/templates/_helpers.tpl

@@ -76,9 +76,9 @@ Define clickhouse24 component definition regex pattern
 {{- end -}}
 
 {{/*
-Define ch-keeper24 component definition name
+Define clickhouse-keeper24 component definition name
 */}}
-{{- define "ch-keeper24.cmpdName" -}}
+{{- define "clickhouse-keeper24.cmpdName" -}}
 {{- if eq (len .Values.cmpdVersionPrefix.keeper24 ) 0 -}}
 clickhouse-keeper-24-{{ .Chart.Version }}
 {{- else -}}
@@ -87,9 +87,9 @@ clickhouse-keeper-24-{{ .Chart.Version }}
 {{- end -}}
 
 {{/*
-Define ch-keeper24 component definition regex pattern
+Define clickhouse-keeper24 component definition regex pattern
 */}}
-{{- define "ch-keeper24.cmpdRegexpPattern" -}}
+{{- define "clickhouse-keeper24.cmpdRegexpPattern" -}}
 ^clickhouse-keeper-24.*
 {{- end -}}
 
@@ -122,9 +122,9 @@ clickhouse-24-user-configuration-tpl
 {{- end -}}
 
 {{/*
-Define ch-keeper24 configuration tpl name
+Define clickhouse-keeper24 configuration tpl name
 */}}
-{{- define "ch-keeper24.configurationTplName" -}}
+{{- define "clickhouse-keeper24.configurationTplName" -}}
 clickhouse-keeper-24-configuration-tpl
 {{- end -}}
 

addons/clickhouse/templates/clusterdefinition.yaml

@@ -15,7 +15,7 @@ spec:
         - name: clickhouse
           compDef: {{ include "clickhouse24.cmpdRegexpPattern" .}}
         - name: ch-keeper
-          compDef: {{ include "ch-keeper24.cmpdRegexpPattern" .}}
+          compDef: {{ include "clickhouse-keeper24.cmpdRegexpPattern" .}}
       orders:
         provision:
           - ch-keeper

addons/clickhouse/templates/cmpd-ch-keeper.yaml

@@ -1,7 +1,7 @@
 apiVersion: apps.kubeblocks.io/v1
 kind: ComponentDefinition
 metadata:
-  name: {{ include "ch-keeper24.cmpdName" . }}
+  name: {{ include "clickhouse-keeper24.cmpdName" . }}
   labels:
     {{- include "clickhouse.labels" . | nindent 4 }}
   annotations:
@@ -108,8 +108,8 @@ spec:
     scrapePath: /metrics
     scrapePort: "8001"
   configs:
-    - name: ch-keeper-tpl
-      templateRef: {{ include "ch-keeper24.configurationTplName" . }}
+    - name: clickhouse-keeper-tpl
+      templateRef: {{ include "clickhouse-keeper24.configurationTplName" . }}
       volumeName: config
       namespace: {{ .Release.Namespace }}
   systemAccounts:

addons/clickhouse/templates/cmpd-clickhouse.yaml

@@ -132,7 +132,7 @@ spec:
     - name: CH_KEEPER_POD_FQDN_LIST
       valueFrom:
         componentVarRef:
-          compDef: {{ include "ch-keeper24.cmpdRegexpPattern" . }}
+          compDef: {{ include "clickhouse-keeper24.cmpdRegexpPattern" . }}
           optional: true
           podFQDNs: Required
   volumes:

addons/clickhouse/templates/cmpv.yaml

@@ -13,7 +13,7 @@ spec:
     - releases:
         - 24.8.3
       compDefs:
-        - {{ include "ch-keeper24.cmpdRegexpPattern" . }}
+        - {{ include "clickhouse-keeper24.cmpdRegexpPattern" . }}
   releases:
     - name: 24.8.3
       serviceVersion: 24.8.3

addons/clickhouse/templates/configmap.yaml

@@ -31,7 +31,7 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "ch-keeper24.configurationTplName" . }}
+  name: {{ include "clickhouse-keeper24.configurationTplName" . }}
   labels:
     {{- include "clickhouse.labels" . | nindent 4 }}
 data:

addons/clickhouse/values.yaml

@@ -16,7 +16,7 @@ commonAnnotations: {}
 # If specified, the component definition will use it as prefix.
 cmpdVersionPrefix:
   clickhouse24: "clickhouse-24"
-  keeper24: "ch-keeper-24"
+  keeper24: "clickhouse-keeper-24"
 
 image:
   registry: docker.io

examples/clickhouse/cluster.yaml

@@ -48,7 +48,7 @@ spec:
               requests:
                 storage: 20Gi
     - name: ch-keeper
-      componentDef: ch-keeper-24
+      componentDef: clickhouse-keeper-24
       serviceAccountName: kb-clickhouse-cluster
       replicas: 1
       systemAccounts:

examples/clickhouse/restart.yaml

@@ -11,5 +11,5 @@ spec:
   restart:
     # Specifies the name of the Component.
     # - clickhouse
-    # - ch-keeper
+    # - clickhouse-keeper
   - componentName: clickhouse

examples/clickhouse/verticalscale.yaml

@@ -10,7 +10,7 @@ spec:
   # Lists VerticalScaling objects, each specifying a component and its desired compute resources for vertical scaling.
   verticalScaling:
     # - clickhouse
-    # - ch-keeper
+    # - clickhouse-keeper
   - componentName: clickhouse
     # VerticalScaling refers to the process of adjusting the compute resources (e.g., CPU, memory) allocated to a Component. It defines the parameters required for the operation.
     requests:

examples/clickhouse/volumeexpand.yaml

@@ -11,7 +11,7 @@ spec:
   volumeExpansion:
     # Specifies the name of the Component.
     # - clickhouse
-    # - ch-keeper
+    # - clickhouse-keeper
   - componentName: clickhouse
     # volumeClaimTemplates specifies the storage size and volumeClaimTemplate name.
     volumeClaimTemplates: