chore: support parameters api for clickhouse (#1372)

(cherry picked from commit 31fdd55)
apecloud · Mar 3, 2025 · 9e8b0e7 · 9e8b0e7
1 parent 844ee72
commit 9e8b0e7
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 10 deletions.
diff --git a/addons/clickhouse/templates/_helpers.tpl b/addons/clickhouse/templates/_helpers.tpl
@@ -104,10 +104,18 @@ Define clickhouse-keeper24 component definition regex pattern
 {{/*
 Define clickhouse24 config constraint name
 */}}
-{{- define "clickhouse24.configConstraintName" -}}
-clickhouse-24-config-constraints
+{{- define "clickhouse24.paramsDefName" -}}
+clickhouse-24-pd
 {{- end -}}
 
+{{/*
+Define clickhouse24 config constraint name
+*/}}
+{{- define "clickhouse24.pcrName" -}}
+clickhouse-24-pcr
+{{- end -}}
+
+
 {{/*
 Define clickhouse24 default overrides configuration tpl name
 */}}

diff --git a/addons/clickhouse/templates/cmpd-clickhouse.yaml b/addons/clickhouse/templates/cmpd-clickhouse.yaml
@@ -78,7 +78,6 @@ spec:
       templateRef: {{ include "clickhouse24.userTplName" . }}
       volumeName: user-config
       namespace: {{ .Release.Namespace }}
-      constraintRef: {{ include "clickhouse24.configConstraintName" . }}
     - name: clickhouse-client-tpl
       templateRef: {{ include "clickhouse24.clientTplName" . }}
       volumeName: client-config

diff --git a/...ickhouse/templates/configconstraints.yaml → addons/clickhouse/templates/paramsdef.yaml b/...ickhouse/templates/configconstraints.yaml → addons/clickhouse/templates/paramsdef.yaml
@@ -1,10 +1,12 @@
-apiVersion: apps.kubeblocks.io/v1beta1
-kind: ConfigConstraint
+{{- $pd := .Files.Get "config/3.0.2/broker-config-effect-scope.yaml" | fromYaml }}
+apiVersion: parameters.kubeblocks.io/v1alpha1
+kind: ParametersDefinition
 metadata:
-  name: {{ include "clickhouse24.configConstraintName" . }}
+  name: {{ include "clickhouse24.paramsDefName" . }}
   labels:
     {{- include "clickhouse.labels" . | nindent 4 }}
 spec:
+  fileName: user.xml
   # ConfigurationSchema that impose restrictions on engine parameter's rule
   parametersSchema:
     # top level mysql configuration type
@@ -13,7 +15,4 @@ spec:
     # schemaInJSON: auto generate from cue scripts
     # example: ../../pkg/configuration/testdata/mysql_openapi.json
     cue: |-
-      {{- .Files.Get "configs/clickhouse-config-constraint.cue" | nindent 6 }}
-  # mysql configuration file format
-  fileFormatConfig:
-    format: xml
+      {{- .Files.Get "configs/clickhouse-config-constraint.cue" | nindent 6 }}
diff --git a/addons/clickhouse/templates/pcr.yaml b/addons/clickhouse/templates/pcr.yaml
@@ -0,0 +1,25 @@
+apiVersion: parameters.kubeblocks.io/v1alpha1
+kind: ParamConfigRenderer
+metadata:
+  name: {{ include "clickhouse24.pcrName" . }}
+  labels:
+    {{- include "clickhouse.labels" . | nindent 4 }}
+spec:
+  componentDef: {{ include "clickhouse24.cmpdName" . }}
+  parametersDefs:
+    - {{ include "clickhouse24.paramsDefName" . }}
+
+  configs:
+    - name: config.xml
+      fileFormatConfig:
+        format: xml
+      reRenderResourceTypes:
+        - tls
+    - name: user.xml
+      fileFormatConfig:
+        format: xml
+    - name: 00_default_overrides.xml
+      fileFormatConfig:
+        format: xml
+      reRenderResourceTypes:
+        - hscale