diff --git a/addons/postgresql/templates/_helpers.tpl b/addons/postgresql/templates/_helpers.tpl index d707d4b83..1ec6fab47 100644 --- a/addons/postgresql/templates/_helpers.tpl +++ b/addons/postgresql/templates/_helpers.tpl @@ -60,6 +60,20 @@ Generate scripts configmap {{- end }} {{- end }} +{{/* +Define postgresql cluster definition name +*/}} +{{- define "postgresql.clusterDefinition" -}} +postgresql +{{- end -}} + +{{/* +Define postgresql component version name +*/}} +{{- define "postgresql.componentVersion" -}} +postgresql +{{- end -}} + {{/* Define postgresql component definition name prefix */}} @@ -67,37 +81,142 @@ Define postgresql component definition name prefix {{- printf "postgresql-" -}} {{- end -}} +{{/* +Define postgresql 12 component definition name prefix +*/}} +{{- define "postgresql12.componentDefNamePrefix" -}} +{{- printf "postgresql-12-" -}} +{{- end -}} + +{{/* +Define postgresql 14 component definition name prefix +*/}} +{{- define "postgresql14.componentDefNamePrefix" -}} +{{- printf "postgresql-14-" -}} +{{- end -}} + +{{/* +Define postgresql 15 component definition name prefix +*/}} +{{- define "postgresql15.componentDefNamePrefix" -}} +{{- printf "postgresql-15-" -}} +{{- end -}} + {{/* Define postgresql12 component definition name */}} -{{- define "postgresql.compDefPostgresql12" -}} +{{- define "postgresql12.compDefName" -}} {{- if eq (len .Values.componentDefinitionVersion.postgresql12) 0 -}} -postgresql-12 +postgresql-12-{{ .Chart.Version }} {{- else -}} -{{ include "postgresql.componentDefNamePrefix" . }}{{ .Values.componentDefinitionVersion.postgresql12 }} +{{ include "postgresql.componentDefNamePrefix" . }}{{ .Values.componentDefinitionVersion.postgresql12 }}-{{ .Chart.Version }} {{- end -}} {{- end -}} {{/* -Define postgresql14 component definition name +Define postgresql14 component definition name with Chart.Version suffix */}} -{{- define "postgresql.compDefPostgresql14" -}} +{{- define "postgresql14.compDefName" -}} {{- if eq (len .Values.componentDefinitionVersion.postgresql14) 0 -}} -postgresql-14 +postgresql-14-{{ .Chart.Version }} {{- else -}} -{{ include "postgresql.componentDefNamePrefix" . }}{{ .Values.componentDefinitionVersion.postgresql14 }} +{{ include "postgresql.componentDefNamePrefix" . }}{{ .Values.componentDefinitionVersion.postgresql14 }}-{{ .Chart.Version }} {{- end -}} {{- end -}} {{/* Define postgresql15 component definition name */}} -{{- define "postgresql.compDefPostgresql15" -}} +{{- define "postgresql15.compDefName" -}} {{- if eq (len .Values.componentDefinitionVersion.postgresql15) 0 -}} -postgresql-15 +postgresql-15-{{ .Chart.Version }} {{- else -}} -{{ include "postgresql.componentDefNamePrefix" . }}{{ .Values.componentDefinitionVersion.postgresql15 }} +{{ include "postgresql.componentDefNamePrefix" . }}{{ .Values.componentDefinitionVersion.postgresql15 }}-{{ .Chart.Version }} +{{- end -}} +{{- end -}} + +{{/* +Define postgresql12 component configuration template name +*/}} +{{- define "postgresql12.configurationTemplate" -}} +postgresql12-configuration-{{ .Chart.Version }} +{{- end -}} + +{{/* +Define postgresql14 component configuration template name +*/}} +{{- define "postgresql14.configurationTemplate" -}} +postgresql14-configuration-{{ .Chart.Version }} +{{- end -}} + +{{/* +Define postgresql15 component configuration template name +*/}} +{{- define "postgresql15.configurationTemplate" -}} +postgresql15-configuration-{{ .Chart.Version }} +{{- end -}} + +{{/* +Define postgresql12 component config constraint name +*/}} +{{- define "postgresql12.configConstraint" -}} +postgresql12-cc-{{ .Chart.Version }} +{{- end -}} + +{{/* +Define postgresql14 component config constraint name +*/}} +{{- define "postgresql14.configConstraint" -}} +postgresql14-cc-{{ .Chart.Version }} +{{- end -}} + +{{/* +Define postgresql15 component config constraint name +*/}} +{{- define "postgresql15.configConstraint" -}} +postgresql15-cc-{{ .Chart.Version }} +{{- end -}} + +{{/* +Define postgresql12 component metrice configuration name +*/}} +{{- define "postgresql12.metricsConfiguration" -}} +postgresql12-custom-metrics-{{ .Chart.Version }} +{{- end -}} + +{{/* +Define postgresql14 component metrice configuration name +*/}} +{{- define "postgresql14.metricsConfiguration" -}} +postgresql14-custom-metrics-{{ .Chart.Version }} {{- end -}} + +{{/* +Define postgresql15 component metrice configuration name +*/}} +{{- define "postgresql15.metricsConfiguration" -}} +postgresql15-custom-metrics-{{ .Chart.Version }} +{{- end -}} + +{{/* +Define postgresql scripts configMap template name +*/}} +{{- define "postgresql.scriptsTemplate" -}} +postgresql-scripts-{{ .Chart.Version }} +{{- end -}} + +{{/* +Define postgresql patroni reload scripts template name +*/}} +{{- define "postgresql.patroniReloadScriptsTemplate" -}} +patroni-reload-scripts-{{ .Chart.Version }} +{{- end -}} + +{{/* +Define pgbouncer configuration template name +*/}} +{{- define "pgbouncer.configurationTemplate" -}} +pgbouncer-configuration-{{ .Chart.Version }} {{- end -}} {{/* diff --git a/addons/postgresql/templates/backuppolicytemplate.yaml b/addons/postgresql/templates/backuppolicytemplate.yaml index 44ca85f0d..8916f3dfa 100644 --- a/addons/postgresql/templates/backuppolicytemplate.yaml +++ b/addons/postgresql/templates/backuppolicytemplate.yaml @@ -20,7 +20,10 @@ metadata: } spec: backupPolicies: - - componentDefs: [postgresql-14, postgresql-12] + - componentDefs: + - {{ include "postgresql12.compDefName" . }} + - {{ include "postgresql14.compDefName" . }} + - {{ include "postgresql15.compDefName" . }} target: role: secondary fallbackRole: primary @@ -33,11 +36,14 @@ spec: - key: IMAGE_TAG valueFrom: componentDef: - - names: [postgresql-12] + - names: + - {{ include "postgresql12.compDefName" . }} mappingValue: "12.15.0-pgvector-v0.6.1" - - names: [postgresql-14] + - names: + - {{ include "postgresql14.compDefName" . }} mappingValue: "14.8.0-pgvector-v0.6.1" - - names: [postgresql-15] + - names: + - {{ include "postgresql15.compDefName" . }} mappingValue: "15.7.0" targetVolumes: volumeMounts: diff --git a/addons/postgresql/templates/clusterdefinition.yaml b/addons/postgresql/templates/clusterdefinition.yaml index 0437b4829..327803290 100644 --- a/addons/postgresql/templates/clusterdefinition.yaml +++ b/addons/postgresql/templates/clusterdefinition.yaml @@ -1,7 +1,7 @@ apiVersion: apps.kubeblocks.io/v1alpha1 kind: ClusterDefinition metadata: - name: postgresql + name: {{ include "postgresql.clusterDefinition" . }} labels: {{- include "postgresql.labels" . | nindent 4 }} spec: diff --git a/addons/postgresql/templates/componentdefinition-12.yaml b/addons/postgresql/templates/componentdefinition-12.yaml index 3aca6bda1..a08e52388 100644 --- a/addons/postgresql/templates/componentdefinition-12.yaml +++ b/addons/postgresql/templates/componentdefinition-12.yaml @@ -1,7 +1,7 @@ apiVersion: apps.kubeblocks.io/v1alpha1 kind: ComponentDefinition metadata: - name: {{ include "postgresql.compDefPostgresql12" . }} + name: {{ include "postgresql12.compDefName" . }} labels: {{- include "postgresql.labels" . | nindent 4 }} spec: @@ -48,8 +48,8 @@ spec: scrapePath: /metrics configs: - name: postgresql-configuration - templateRef: postgresql12-configuration - constraintRef: postgresql12-cc + templateRef: {{ include "postgresql12.configurationTemplate" . }} + constraintRef: {{ include "postgresql12.configConstraint" . }} keys: - postgresql.conf namespace: {{ .Release.Namespace }} @@ -65,7 +65,7 @@ spec: volumeName: pgbouncer-config defaultMode: 0777 - name: postgresql-custom-metrics - templateRef: postgresql12-custom-metrics + templateRef: {{ include "postgresql12.metricsConfiguration" . }} namespace: {{ .Release.Namespace }} volumeName: postgresql-custom-metrics defaultMode: 0444 @@ -88,14 +88,14 @@ spec: - name: POSTGRES_COMPONENT_NAME valueFrom: componentVarRef: - compDef: {{ include "postgresql.compDefPostgresql12" . }} + compDef: {{ include "postgresql12.compDefName" . }} optional: false componentName: Required ## the component short name of postgres, it's the short name of postgres component without clusterName prefix - name: POSTGRES_COMPONENT_SHORT_NAME valueFrom: componentVarRef: - compDef: {{ include "postgresql.compDefPostgresql12" . }} + compDef: {{ include "postgresql12.compDefName" . }} optional: false shortName: Required ## the etcd version if postgres patroni use etcd as DCS @@ -111,14 +111,14 @@ spec: - name: POSTGRES_USER valueFrom: credentialVarRef: - compDef: {{ include "postgresql.compDefPostgresql12" . }} + compDef: {{ include "postgresql12.compDefName" . }} name: postgres optional: false username: Required - name: POSTGRES_PASSWORD valueFrom: credentialVarRef: - compDef: {{ include "postgresql.compDefPostgresql12" . }} + compDef: {{ include "postgresql12.compDefName" . }} name: postgres optional: false password: Required @@ -126,21 +126,21 @@ spec: - name: POSTGRES_POD_NAME_LIST valueFrom: componentVarRef: - compDef: {{ include "postgresql.compDefPostgresql12" . }} + compDef: {{ include "postgresql12.compDefName" . }} optional: false podNames: Required ## the postgres pod fqdn list for each pod, the value format is "pod1FQDN,pod2FQDN,..." - name: POSTGRES_POD_FQDN_LIST valueFrom: componentVarRef: - compDef: {{ include "postgresql.compDefPostgresql12" . }} + compDef: {{ include "postgresql12.compDefName" . }} optional: false podFQDNs: Required ## the postgres primary pod name which is dynamically selected, caution to use it - name: POSTGRES_PRIMARY_POD_NAME valueFrom: componentVarRef: - compDef: {{ include "postgresql.compDefPostgresql12" . }} + compDef: {{ include "postgresql12.compDefName" . }} optional: true podNamesForRole: role: primary diff --git a/addons/postgresql/templates/componentdefinition-14.yaml b/addons/postgresql/templates/componentdefinition-14.yaml index 3197296b3..d953f1d7c 100644 --- a/addons/postgresql/templates/componentdefinition-14.yaml +++ b/addons/postgresql/templates/componentdefinition-14.yaml @@ -1,7 +1,7 @@ apiVersion: apps.kubeblocks.io/v1alpha1 kind: ComponentDefinition metadata: - name: {{ include "postgresql.compDefPostgresql14" . }} + name: {{ include "postgresql14.compDefName" . }} labels: {{- include "postgresql.labels" . | nindent 4 }} spec: @@ -48,8 +48,8 @@ spec: scrapePath: /metrics configs: - name: postgresql-configuration - templateRef: postgresql14-configuration - constraintRef: postgresql14-cc + templateRef: {{ include "postgresql14.configurationTemplate" . }} + constraintRef: {{ include "postgresql14.configConstraint" . }} keys: - postgresql.conf namespace: {{ .Release.Namespace }} @@ -65,7 +65,7 @@ spec: volumeName: pgbouncer-config defaultMode: 0777 - name: postgresql-custom-metrics - templateRef: postgresql14-custom-metrics + templateRef: {{ include "postgresql14.metricsConfiguration" . }} namespace: {{ .Release.Namespace }} volumeName: postgresql-custom-metrics defaultMode: 0444 @@ -88,14 +88,14 @@ spec: - name: POSTGRES_COMPONENT_NAME valueFrom: componentVarRef: - compDef: {{ include "postgresql.compDefPostgresql14" . }} + compDef: {{ include "postgresql14.compDefName" . }} optional: false componentName: Required ## the component short name of postgres, it's the short name of postgres component without clusterName prefix - name: POSTGRES_COMPONENT_SHORT_NAME valueFrom: componentVarRef: - compDef: {{ include "postgresql.compDefPostgresql14" . }} + compDef: {{ include "postgresql14.compDefName" . }} optional: false shortName: Required ## the etcd version if postgres patroni use etcd as DCS @@ -111,14 +111,14 @@ spec: - name: POSTGRES_USER valueFrom: credentialVarRef: - compDef: {{ include "postgresql.compDefPostgresql14" . }} + compDef: {{ include "postgresql14.compDefName" . }} name: postgres optional: false username: Required - name: POSTGRES_PASSWORD valueFrom: credentialVarRef: - compDef: {{ include "postgresql.compDefPostgresql14" . }} + compDef: {{ include "postgresql14.compDefName" . }} name: postgres optional: false password: Required @@ -126,21 +126,21 @@ spec: - name: POSTGRES_POD_NAME_LIST valueFrom: componentVarRef: - compDef: {{ include "postgresql.compDefPostgresql14" . }} + compDef: {{ include "postgresql14.compDefName" . }} optional: false podNames: Required ## the postgres pod fqdn list for each pod, the value format is "pod1FQDN,pod2FQDN,..." - name: POSTGRES_POD_FQDN_LIST valueFrom: componentVarRef: - compDef: {{ include "postgresql.compDefPostgresql14" . }} + compDef: {{ include "postgresql14.compDefName" . }} optional: false podFQDNs: Required ## the postgres primary pod name which is dynamically selected, caution to use it - name: POSTGRES_PRIMARY_POD_NAME valueFrom: componentVarRef: - compDef: {{ include "postgresql.compDefPostgresql14" . }} + compDef: {{ include "postgresql14.compDefName" . }} optional: true podNamesForRole: role: primary diff --git a/addons/postgresql/templates/componentdefinition-15.yaml b/addons/postgresql/templates/componentdefinition-15.yaml index 40387d07c..a507dd9e5 100644 --- a/addons/postgresql/templates/componentdefinition-15.yaml +++ b/addons/postgresql/templates/componentdefinition-15.yaml @@ -1,7 +1,7 @@ apiVersion: apps.kubeblocks.io/v1alpha1 kind: ComponentDefinition metadata: - name: {{ include "postgresql.compDefPostgresql15" . }} + name: {{ include "postgresql15.compDefName" . }} labels: {{- include "postgresql.labels" . | nindent 4 }} spec: @@ -48,8 +48,8 @@ spec: scrapePath: /metrics configs: - name: postgresql-configuration - templateRef: postgresql15-configuration - constraintRef: postgresql15-cc + templateRef: {{ include "postgresql15.configurationTemplate" . }} + constraintRef: {{ include "postgresql15.configConstraint" . }} keys: - postgresql.conf namespace: {{ .Release.Namespace }} @@ -65,7 +65,7 @@ spec: volumeName: pgbouncer-config defaultMode: 0777 - name: postgresql-custom-metrics - templateRef: postgresql15-custom-metrics + templateRef: {{ include "postgresql15.metricsConfiguration" . }} namespace: {{ .Release.Namespace }} volumeName: postgresql-custom-metrics defaultMode: 0444 @@ -88,14 +88,14 @@ spec: - name: POSTGRES_COMPONENT_NAME valueFrom: componentVarRef: - compDef: {{ include "postgresql.compDefPostgresql15" . }} + compDef: {{ include "postgresql15.compDefName" . }} optional: false componentName: Required ## the component short name of postgres, it's the short name of postgres component without clusterName prefix - name: POSTGRES_COMPONENT_SHORT_NAME valueFrom: componentVarRef: - compDef: {{ include "postgresql.compDefPostgresql15" . }} + compDef: {{ include "postgresql15.compDefName" . }} optional: false shortName: Required ## the etcd version if postgres patroni use etcd as DCS @@ -111,14 +111,14 @@ spec: - name: POSTGRES_USER valueFrom: credentialVarRef: - compDef: {{ include "postgresql.compDefPostgresql15" . }} + compDef: {{ include "postgresql15.compDefName" . }} name: postgres optional: false username: Required - name: POSTGRES_PASSWORD valueFrom: credentialVarRef: - compDef: {{ include "postgresql.compDefPostgresql15" . }} + compDef: {{ include "postgresql15.compDefName" . }} name: postgres optional: false password: Required @@ -126,21 +126,21 @@ spec: - name: POSTGRES_POD_NAME_LIST valueFrom: componentVarRef: - compDef: {{ include "postgresql.compDefPostgresql15" . }} + compDef: {{ include "postgresql15.compDefName" . }} optional: false podNames: Required ## the postgres pod fqdn list for each pod, the value format is "pod1FQDN,pod2FQDN,..." - name: POSTGRES_POD_FQDN_LIST valueFrom: componentVarRef: - compDef: {{ include "postgresql.compDefPostgresql15" . }} + compDef: {{ include "postgresql15.compDefName" . }} optional: false podFQDNs: Required ## the postgres primary pod name which is dynamically selected, caution to use it - name: POSTGRES_PRIMARY_POD_NAME valueFrom: componentVarRef: - compDef: {{ include "postgresql.compDefPostgresql15" . }} + compDef: {{ include "postgresql15.compDefName" . }} optional: true podNamesForRole: role: primary diff --git a/addons/postgresql/templates/componentversion.yaml b/addons/postgresql/templates/componentversion.yaml index 4d3a29938..7874f1c3d 100644 --- a/addons/postgresql/templates/componentversion.yaml +++ b/addons/postgresql/templates/componentversion.yaml @@ -1,22 +1,22 @@ apiVersion: apps.kubeblocks.io/v1alpha1 kind: ComponentVersion metadata: - name: postgresql + name: {{ include "postgresql.componentVersion" . }} spec: compatibilityRules: - compDefs: - - {{ include "postgresql.compDefPostgresql12" . }} + - {{ include "postgresql12.componentDefNamePrefix" . }} releases: - 12.14.0 - 12.14.1 - 12.15.0 - compDefs: - - {{ include "postgresql.compDefPostgresql14" . }} + - {{ include "postgresql14.componentDefNamePrefix" . }} releases: - 14.7.2 - 14.8.0 - compDefs: - - {{ include "postgresql.compDefPostgresql15" . }} + - {{ include "postgresql15.componentDefNamePrefix" . }} releases: - 15.7.0 releases: diff --git a/addons/postgresql/templates/configconstraint-12.yaml b/addons/postgresql/templates/configconstraint-12.yaml index a9a4c3ef1..0029c66ac 100644 --- a/addons/postgresql/templates/configconstraint-12.yaml +++ b/addons/postgresql/templates/configconstraint-12.yaml @@ -2,7 +2,7 @@ apiVersion: apps.kubeblocks.io/v1beta1 kind: ConfigConstraint metadata: - name: postgresql12-cc + name: {{ include "postgresql12.configConstraint" . }} labels: {{- include "postgresql.labels" . | nindent 4 }} spec: diff --git a/addons/postgresql/templates/configconstraint-14.yaml b/addons/postgresql/templates/configconstraint-14.yaml index 4a1dd0a26..1ad821f82 100644 --- a/addons/postgresql/templates/configconstraint-14.yaml +++ b/addons/postgresql/templates/configconstraint-14.yaml @@ -2,7 +2,7 @@ apiVersion: apps.kubeblocks.io/v1beta1 kind: ConfigConstraint metadata: - name: postgresql14-cc + name: {{ include "postgresql14.configConstraint" . }} labels: {{- include "postgresql.labels" . | nindent 4 }} spec: diff --git a/addons/postgresql/templates/configconstraint-15.yaml b/addons/postgresql/templates/configconstraint-15.yaml index eb9fda078..18e34fe1e 100644 --- a/addons/postgresql/templates/configconstraint-15.yaml +++ b/addons/postgresql/templates/configconstraint-15.yaml @@ -2,7 +2,7 @@ apiVersion: apps.kubeblocks.io/v1beta1 kind: ConfigConstraint metadata: - name: postgresql15-cc + name: {{ include "postgresql15.configConstraint" . }} labels: {{- include "postgresql.labels" . | nindent 4 }} spec: diff --git a/addons/postgresql/templates/configmap-12.yaml b/addons/postgresql/templates/configmap-12.yaml index 9b8df35c1..fd1cf5013 100644 --- a/addons/postgresql/templates/configmap-12.yaml +++ b/addons/postgresql/templates/configmap-12.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: postgresql12-configuration + name: {{ include "postgresql12.configurationTemplate" . }} labels: {{- include "postgresql.labels" . | nindent 4 }} data: diff --git a/addons/postgresql/templates/configmap-14.yaml b/addons/postgresql/templates/configmap-14.yaml index f538b0fb1..e72316d3c 100644 --- a/addons/postgresql/templates/configmap-14.yaml +++ b/addons/postgresql/templates/configmap-14.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: postgresql14-configuration + name: {{ include "postgresql14.configurationTemplate" . }} labels: {{- include "postgresql.labels" . | nindent 4 }} data: diff --git a/addons/postgresql/templates/configmap-15.yaml b/addons/postgresql/templates/configmap-15.yaml index a1e2f33be..631759b7a 100644 --- a/addons/postgresql/templates/configmap-15.yaml +++ b/addons/postgresql/templates/configmap-15.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: postgresql15-configuration + name: {{ include "postgresql15.configurationTemplate" . }} labels: {{- include "postgresql.labels" . | nindent 4 }} data: diff --git a/addons/postgresql/templates/metrics-configmap-12.yaml b/addons/postgresql/templates/metrics-configmap-12.yaml index 6a965c408..76a2ac287 100644 --- a/addons/postgresql/templates/metrics-configmap-12.yaml +++ b/addons/postgresql/templates/metrics-configmap-12.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: postgresql12-custom-metrics + name: {{ include "postgresql12.metricsConfiguration" . }} labels: {{- include "postgresql.labels" . | nindent 4 }} data: diff --git a/addons/postgresql/templates/metrics-configmap-14.yaml b/addons/postgresql/templates/metrics-configmap-14.yaml index 1357bbca9..6abdbcd13 100644 --- a/addons/postgresql/templates/metrics-configmap-14.yaml +++ b/addons/postgresql/templates/metrics-configmap-14.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: postgresql14-custom-metrics + name: {{ include "postgresql14.metricsConfiguration" . }} labels: {{- include "postgresql.labels" . | nindent 4 }} data: diff --git a/addons/postgresql/templates/metrics-configmap-15.yaml b/addons/postgresql/templates/metrics-configmap-15.yaml index 352536068..ecad50902 100644 --- a/addons/postgresql/templates/metrics-configmap-15.yaml +++ b/addons/postgresql/templates/metrics-configmap-15.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: postgresql15-custom-metrics + name: {{ include "postgresql15.metricsConfiguration" . }} labels: {{- include "postgresql.labels" . | nindent 4 }} data: diff --git a/addons/postgresql/templates/patroni-reload.yaml b/addons/postgresql/templates/patroni-reload.yaml index 3ad4aba22..7c9c8865f 100644 --- a/addons/postgresql/templates/patroni-reload.yaml +++ b/addons/postgresql/templates/patroni-reload.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: patroni-reload-script + name: {{ include "postgresql.patroniReloadScriptsTemplate" . }} labels: {{- include "postgresql.labels" . | nindent 4 }} data: diff --git a/addons/postgresql/templates/pgbouncer-configmap.yaml b/addons/postgresql/templates/pgbouncer-configmap.yaml index 0b54bbccb..afa04f98d 100644 --- a/addons/postgresql/templates/pgbouncer-configmap.yaml +++ b/addons/postgresql/templates/pgbouncer-configmap.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: pgbouncer-configuration + name: {{ include "pgbouncer.configurationTemplate" . }} labels: {{- include "postgresql.labels" . | nindent 4 }} data: diff --git a/addons/postgresql/templates/scripts.yaml b/addons/postgresql/templates/scripts.yaml index 2cf726dcc..3942328f3 100644 --- a/addons/postgresql/templates/scripts.yaml +++ b/addons/postgresql/templates/scripts.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: postgresql-scripts + name: {{ include "postgresql.scriptsTemplate" . }} labels: {{- include "postgresql.labels" . | nindent 4 }} data: