Skip to content

Commit

Permalink
chore: support parameters api for kafka (#1369)
Browse files Browse the repository at this point in the history
  • Loading branch information
sophon-zt authored Mar 3, 2025
1 parent a579c3c commit d3e1e3b
Show file tree
Hide file tree
Showing 12 changed files with 127 additions and 59 deletions.
33 changes: 31 additions & 2 deletions addons/kafka/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -138,17 +138,46 @@ Define kafka-broker component definition regex pattern
{{/*
Define kafka config constraint name
*/}}
{{- define "kafka.configConstraintName" -}}
{{- define "kafka.paramsDefName" -}}
kafka-config-constraints
{{- end -}}

{{/*
Define kafka config constraint name
*/}}
{{- define "kafka2.configConstraintName" -}}
{{- define "kafka2.paramsDefName" -}}
kafka2-config-constraints
{{- end -}}

{{/*
Define kafka parameter config renderer name
*/}}
{{- define "kafka.brokerPCRName" -}}
kafka-broker-pcr
{{- end -}}

{{/*
Define kafka parameter config renderer name
*/}}
{{- define "kafka.combinePCRName" -}}
kafka-combine-pcr
{{- end -}}

{{/*
Define kafka parameter config renderer name
*/}}
{{- define "kafka.controllerPCRName" -}}
kafka-controller-pcr
{{- end -}}

{{/*
Define kafka parameter config renderer name
*/}}
{{- define "kafka2.brokerPCRName" -}}
kafka2-broker-pcr
{{- end -}}


{{/*
Define kafka configuration tpl name
*/}}
Expand Down
1 change: 0 additions & 1 deletion addons/kafka/templates/cmpd-broker-27.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ spec:
updateStrategy: BestEffortParallel
configs:
- name: kafka-configuration-tpl
constraintRef: {{ include "kafka2.configConstraintName" . }}
templateRef: {{ include "kafka2.configurationTplName" . }}
volumeName: kafka-config
namespace: {{ .Release.Namespace }}
Expand Down
1 change: 0 additions & 1 deletion addons/kafka/templates/cmpd-broker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ spec:
updateStrategy: BestEffortParallel
configs:
- name: kafka-configuration-tpl
constraintRef: {{ include "kafka.configConstraintName" . }}
templateRef: {{ include "kafka.configurationTplName" . }}
volumeName: kafka-config
namespace: {{ .Release.Namespace }}
Expand Down
1 change: 0 additions & 1 deletion addons/kafka/templates/cmpd-combine.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ spec:
updateStrategy: BestEffortParallel
configs:
- name: kafka-configuration-tpl
constraintRef: {{ include "kafka.configConstraintName" . }}
templateRef: {{ include "kafka.configurationTplName" . }}
volumeName: kafka-config
namespace: {{ .Release.Namespace }}
Expand Down
1 change: 0 additions & 1 deletion addons/kafka/templates/cmpd-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ spec:
updateStrategy: BestEffortParallel
configs:
- name: kafka-configuration-tpl
constraintRef: {{ include "kafka.configConstraintName" . }}
templateRef: {{ include "kafka.configurationTplName" . }}
volumeName: kafka-config
namespace: {{ .Release.Namespace }}
Expand Down
53 changes: 0 additions & 53 deletions addons/kafka/templates/configconstraint.yaml

This file was deleted.

20 changes: 20 additions & 0 deletions addons/kafka/templates/paramsdef.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
apiVersion: parameters.kubeblocks.io/v1alpha1
kind: ParametersDefinition
metadata:
name: {{ include "kafka.paramsDefName" . }}
labels:
{{- include "kafka.labels" . | nindent 4 }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
fileName: server.properties
parametersSchema:
# top level mysql configuration type
topLevelKey: KafkaParameter
# schemaInJSON: auto generate from cue scripts
cue: |-
{{- .Files.Get "configs/kafka-server-constraint.cue" | nindent 6 }}
20 changes: 20 additions & 0 deletions addons/kafka/templates/paramsdef2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
apiVersion: parameters.kubeblocks.io/v1alpha1
kind: ParametersDefinition
metadata:
name: {{ include "kafka2.paramsDefName" . }}
labels:
{{- include "kafka.labels" . | nindent 4 }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
fileName: server.properties
parametersSchema:
# top level mysql configuration type
topLevelKey: KafkaParameter
# schemaInJSON: auto generate from cue scripts
cue: |-
{{- .Files.Get "configs/2.7/kafka-27-server-constraint.cue" | nindent 6 }}
14 changes: 14 additions & 0 deletions addons/kafka/templates/pcr-broker.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apiVersion: parameters.kubeblocks.io/v1alpha1
kind: ParamConfigRenderer
metadata:
name: {{ include "kafka.brokerPCRName" . }}
labels:
{{- include "kafka.labels" . | nindent 4 }}
spec:
componentDef: {{ include "kafka-broker.componentDefName" . }}
parametersDefs:
- {{ include "kafka.paramsDefName" . }}
configs:
- name: server.properties
fileFormatConfig:
format: properties
14 changes: 14 additions & 0 deletions addons/kafka/templates/pcr-broker2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apiVersion: parameters.kubeblocks.io/v1alpha1
kind: ParamConfigRenderer
metadata:
name: {{ include "kafka2.brokerPCRName" . }}
labels:
{{- include "kafka.labels" . | nindent 4 }}
spec:
componentDef: {{ include "kafka2-broker.componentDefName" . }}
parametersDefs:
- {{ include "kafka2.paramsDefName" . }}
configs:
- name: server.properties
fileFormatConfig:
format: properties
14 changes: 14 additions & 0 deletions addons/kafka/templates/pcr-combine.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apiVersion: parameters.kubeblocks.io/v1alpha1
kind: ParamConfigRenderer
metadata:
name: {{ include "kafka.combinePCRName" . }}
labels:
{{- include "kafka.labels" . | nindent 4 }}
spec:
componentDef: {{ include "kafka-combine.componentDefName" . }}
parametersDefs:
- {{ include "kafka.paramsDefName" . }}
configs:
- name: server.properties
fileFormatConfig:
format: properties
14 changes: 14 additions & 0 deletions addons/kafka/templates/pcr-controller.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apiVersion: parameters.kubeblocks.io/v1alpha1
kind: ParamConfigRenderer
metadata:
name: {{ include "kafka.controllerPCRName" . }}
labels:
{{- include "kafka.labels" . | nindent 4 }}
spec:
componentDef: {{ include "kafka-controller.componentDefName" . }}
parametersDefs:
- {{ include "kafka.paramsDefName" . }}
configs:
- name: server.properties
fileFormatConfig:
format: properties

0 comments on commit d3e1e3b

Please sign in to comment.