From e30ed3f81e771a1b4a5b437f3782ab9cf7f92f89 Mon Sep 17 00:00:00 2001 From: zhangtao <111836083+sophon-zt@users.noreply.github.com> Date: Mon, 3 Mar 2025 16:52:14 +0800 Subject: [PATCH] chore: support parameters api for mongodb (#1319) (cherry picked from commit 43d8a08e4616ef278c0a4e375bfce9bedaec4d08) --- addons/mongodb/templates/_names.tpl | 11 ++++++++++ .../templates/componentdefinition.yaml | 3 --- .../mongodb/templates/configconstraint.yaml | 22 ------------------- addons/mongodb/templates/configtemplate.yaml | 15 ++----------- addons/mongodb/templates/pcr.yaml | 12 ++++++++++ 5 files changed, 25 insertions(+), 38 deletions(-) delete mode 100644 addons/mongodb/templates/configconstraint.yaml create mode 100644 addons/mongodb/templates/pcr.yaml diff --git a/addons/mongodb/templates/_names.tpl b/addons/mongodb/templates/_names.tpl index 295e330d9..3c250b80d 100644 --- a/addons/mongodb/templates/_names.tpl +++ b/addons/mongodb/templates/_names.tpl @@ -101,3 +101,14 @@ mongodb-scripts {{- .Values.resourceNamePrefix -}}-scripts {{- end -}} {{- end -}} + +{{/* +Define parameter config renderername +*/}} +{{- define "mongodb.pcrName" -}} +{{- if eq (len .Values.resourceNamePrefix) 0 -}} +mongodb-pcr +{{- else -}} +{{- .Values.resourceNamePrefix -}}-pcr +{{- end -}} +{{- end -}} \ No newline at end of file diff --git a/addons/mongodb/templates/componentdefinition.yaml b/addons/mongodb/templates/componentdefinition.yaml index ee91a1c83..a2f53c6fe 100644 --- a/addons/mongodb/templates/componentdefinition.yaml +++ b/addons/mongodb/templates/componentdefinition.yaml @@ -37,12 +37,9 @@ spec: configs: - name: mongodb-config templateRef: {{ include "mongodb.configTplName" . }} - constraintRef: {{ include "mongodb.configConstraintName" . }} volumeName: mongodb-config namespace: {{ .Release.Namespace }} defaultMode: 0400 # for only read - keys: - - mongodb.conf logConfigs: {{- range $name,$pattern := .Values.logConfigs }} - name: {{ $name }} diff --git a/addons/mongodb/templates/configconstraint.yaml b/addons/mongodb/templates/configconstraint.yaml deleted file mode 100644 index 69a5edfef..000000000 --- a/addons/mongodb/templates/configconstraint.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: apps.kubeblocks.io/v1beta1 -kind: ConfigConstraint -metadata: - name: mongodb-env-constraints - labels: - {{- include "mongodb.labels" . | nindent 4 }} -spec: - # mysql configuration file format - fileFormatConfig: - format: yaml ---- - -apiVersion: apps.kubeblocks.io/v1beta1 -kind: ConfigConstraint -metadata: - name: mongodb-config-constraints - labels: - {{- include "mongodb.labels" . | nindent 4 }} -spec: - # mysql configuration file format - fileFormatConfig: - format: yaml diff --git a/addons/mongodb/templates/configtemplate.yaml b/addons/mongodb/templates/configtemplate.yaml index e583ac989..922adb6c7 100644 --- a/addons/mongodb/templates/configtemplate.yaml +++ b/addons/mongodb/templates/configtemplate.yaml @@ -1,22 +1,11 @@ apiVersion: v1 kind: ConfigMap metadata: - name: mongodb5.0-config-template + name: {{ include "mongodb.configTplName" . }} labels: {{- include "mongodb.labels" . | nindent 4 }} data: mongodb.conf: |- {{- .Files.Get "config/mongodb5.0-config.tpl" | nindent 4 }} keyfile: |- - {{- .Files.Get "config/keyfile.tpl" | nindent 4 }} ---- - -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "mongodb.name" . }}-env-tpl - labels: - {{- include "mongodb.labels" . | nindent 4 }} -data: - env: |- - {{- .Files.Get "config/mongodb-env.tpl" | nindent 4 }} + {{- .Files.Get "config/keyfile.tpl" | nindent 4 }} \ No newline at end of file diff --git a/addons/mongodb/templates/pcr.yaml b/addons/mongodb/templates/pcr.yaml new file mode 100644 index 000000000..4b5c0a290 --- /dev/null +++ b/addons/mongodb/templates/pcr.yaml @@ -0,0 +1,12 @@ +apiVersion: parameters.kubeblocks.io/v1alpha1 +kind: ParamConfigRenderer +metadata: + name: {{ include "mongodb.pcrName" . }} + labels: + {{- include "mongodb.labels" . | nindent 4 }} +spec: + componentDef: {{ include "mongodb.compDefName" . }} + configs: + - name: mongodb.conf + fileFormatConfig: + format: yaml