[stable/mariadb] Avoid creating initialization config-map if not needed (#8268)

* [stable/mariadb] Avoid creating initialization config-map if not needed

Signed-off-by: tompizmor <tompizmor@gmail.com>

* Add missing conditional blocks

Signed-off-by: tompizmor <tompizmor@gmail.com>
This commit is contained in:
Tomas Pizarro
2018-10-12 03:00:13 -07:00
committed by k8s-ci-robot
parent 93553e546c
commit edb738ad1f
3 changed files with 12 additions and 6 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
name: mariadb
version: 5.1.1
version: 5.1.2
appVersion: 10.1.36
description: Fast, reliable, scalable, and easy to use open-source relational database system. MariaDB Server is intended for mission-critical, heavy-load production systems as well as for embedding into mass-deployed software. Highly available MariaDB cluster.
keywords:
@@ -1,3 +1,4 @@
{{ if (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|sql|sql.gz]") }}
apiVersion: v1
kind: ConfigMap
metadata:
@@ -9,4 +10,5 @@ metadata:
release: {{ .Release.Name | quote }}
heritage: {{ .Release.Service | quote }}
data:
{{ (.Files.Glob "files/docker-entrypoint-initdb.d/*").AsConfig | indent 2 }}
{{ (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|sql|sql.gz]").AsConfig | indent 2 }}
{{ end }}
@@ -139,8 +139,10 @@ spec:
volumeMounts:
- name: data
mountPath: /bitnami/mariadb
{{- if (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|sql|sql.gz]") }}
- name: custom-init-scripts
mountPath: /docker-entrypoint-initdb.d
{{- end }}
{{- if .Values.master.config }}
- name: config
mountPath: /opt/bitnami/mariadb/conf/my.cnf
@@ -180,19 +182,21 @@ spec:
{{ toYaml .Values.metrics.resources | indent 10 }}
{{- end }}
volumes:
{{- if and .Values.master.persistence.enabled .Values.master.persistence.existingClaim }}
{{- if and .Values.master.persistence.enabled .Values.master.persistence.existingClaim }}
- name: {{ .Values.master.persistence.existingClaim }}
persistentVolumeClaim:
claimName: {{ .Values.master.persistence.existingClaim }}
{{ end }}
{{- if .Values.master.config }}
{{ end }}
{{- if .Values.master.config }}
- name: config
configMap:
name: {{ template "master.fullname" . }}
{{- end }}
{{- end }}
{{- if (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|sql|sql.gz]") }}
- name: custom-init-scripts
configMap:
name: {{ template "master.fullname" . }}-init-scripts
{{- end }}
{{- if .Values.master.persistence.enabled }}
volumeClaimTemplates:
- metadata: