chore: support parameters api for zookeeper

addons/zookeeper/config/zookeeper-config-constraint.cue → addons/zookeeper/config/zookeeper-params_schema.cue

@@ -54,4 +54,9 @@
 
 	// A list of comma separated Four Letter Words commands that user wants to use
 	"4lw.commands.whitelist": string | *"srvr, mntr, ruok, conf"
+
+	...
+}
+
+configuration: #ZookeeperParameter & {
 }

addons/zookeeper/templates/_helpers.tpl

@@ -98,10 +98,17 @@ zookeeper-config-template
 {{- end -}}
 
 {{/*
-Define zookeeper config constraint name
+Define zookeeper parameters definition name
 */}}
-{{- define "zookeeper.configConstraintName" -}}
-zookeeper-config-constraints
+{{- define "zookeeper.paramsDefName" -}}
+zookeeper-pd
+{{- end -}}
+
+{{/*
+Define zookeeper parameters config renderer name
+*/}}
+{{- define "zookeeper.pcrName" -}}
+zookeeper-pcr
 {{- end -}}
 
 {{/*

addons/zookeeper/templates/cmpd.yaml

@@ -81,11 +81,7 @@ spec:
     - name: zookeeper-config
       namespace: {{ .Release.Namespace }}
       templateRef: {{ include "zookeeper.configTplName" . }}
-      constraintRef: {{ include "zookeeper.configConstraintName" . }}
       volumeName: config
-      defaultMode: 0755
-      reRenderResourceTypes:
-        - hscale
     - name: zookeeper-log
       namespace: {{ .Release.Namespace }}
       templateRef: {{ include "zookeeper.logConfigTplName" . }}

addons/zookeeper/templates/configconstraint.yaml → addons/zookeeper/templates/paramsdef.yaml

@@ -1,48 +1,45 @@
-{{- $cc := .Files.Get "config/config-effect-scope.yaml" | fromYaml }}
-apiVersion: apps.kubeblocks.io/v1beta1
-kind: ConfigConstraint
+{{- $pd := .Files.Get "config/config-effect-scope.yaml" | fromYaml }}
+apiVersion: parameters.kubeblocks.io/v1alpha1
+kind: ParametersDefinition
 metadata:
-  name: {{ include "zookeeper.configConstraintName" . }}
+  name: {{ include "zookeeper.paramsDefName" . }}
   labels:
     {{- include "zookeeper.labels" . | nindent 4 }}
 spec:
   reloadAction:
     autoTrigger:
       processName: zookeeper
 
-  # zookeeper configuration file format
-  fileFormatConfig:
-    format: props-plus
-
   ## define immutable parameter list
-  {{- if hasKey $cc "immutableParameters" }}
+  {{- if hasKey $pd "immutableParameters" }}
   immutableParameters:
-    {{- $params := get $cc "immutableParameters" }}
+    {{- $params := get $pd "immutableParameters" }}
     {{- range $params }}
     - {{ . }}
     {{- end }}
   {{- end}}
 
-  {{- if hasKey $cc "dynamicParameters" }}
+  {{- if hasKey $pd "dynamicParameters" }}
   dynamicParameters:
-    {{- $params := get $cc "dynamicParameters" }}
+    {{- $params := get $pd "dynamicParameters" }}
     {{- range $params }}
     - {{ . }}
     {{- end }}
   {{- end}}
 
-  {{- if hasKey $cc "staticParameters" }}
+  {{- if hasKey $pd "staticParameters" }}
   staticParameters:
-    {{- $params := get $cc "staticParameters" }}
+    {{- $params := get $pd "staticParameters" }}
     {{- range $params }}
     - {{ . }}
     {{- end }}
   {{- end}}
 
+  fileName: zoo.cfg
   # ConfigurationSchema that impose restrictions on engine parameter's rule
   parametersSchema:
     # define parameter validation rules
     topLevelKey: ZookeeperParameter
 
     cue: |-
-      {{- .Files.Get "config/zookeeper-config-constraint.cue" | nindent 6 }}
+      {{- .Files.Get "config/zookeeper-params_schema.cue" | nindent 6 }}

addons/zookeeper/templates/pcr.yaml

@@ -0,0 +1,17 @@
+apiVersion: parameters.kubeblocks.io/v1alpha1
+kind: ParamConfigRenderer
+metadata:
+  name: {{ include "zookeeper.pcrName" . }}
+  labels:
+    {{- include "zookeeper.labels" . | nindent 4 }}
+spec:
+  componentDef: {{ include "zookeeper.cmpdName" . }}
+  parametersDefs:
+    - {{ include "zookeeper.paramsDefName" . }}
+
+  configs:
+    - name: zoo.cfg
+      fileFormatConfig:
+        format: props-plus
+      reRenderResourceTypes:
+        - hscale