[stable/mongodb] - ensure that custom init script config maps are mounted when supplied and add *.json files to the list of files that are importable as init scripts (#12483)

Signed-off-by: Michael McCord <michael.lee.mccord@gmail.com>
This commit is contained in:
michaelmccord
2019-03-25 04:37:09 -07:00
committed by Kubernetes Prow Robot
parent b2c1f5fada
commit c47ee3f0e2
4 changed files with 7 additions and 7 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: mongodb
version: 5.14.0
version: 5.14.1
appVersion: 4.0.7
description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications.
keywords:
@@ -148,7 +148,7 @@ spec:
volumeMounts:
- name: data
mountPath: /bitnami/mongodb
{{- if (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|js]") }}
{{- if or (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|js|json]") (.Values.initConfigMap) }}
- name: custom-init-scripts
mountPath: /docker-entrypoint-initdb.d
{{- end }}
@@ -193,7 +193,7 @@ spec:
{{ toYaml .Values.metrics.resources | indent 10 }}
{{- end }}
volumes:
{{- if (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|js]") }}
{{- if (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|js|json]") }}
- name: custom-init-scripts
configMap:
name: {{ template "mongodb.fullname" . }}-init-scripts
@@ -1,4 +1,4 @@
{{ if (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|js]") }}
{{ if (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|js|json]") }}
apiVersion: v1
kind: ConfigMap
metadata:
@@ -9,5 +9,5 @@ metadata:
release: {{ .Release.Name | quote }}
heritage: {{ .Release.Service | quote }}
data:
{{ tpl (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|js]").AsConfig . | indent 2 }}
{{ tpl (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|js|json]").AsConfig . | indent 2 }}
{{ end }}
@@ -174,7 +174,7 @@ spec:
volumeMounts:
- name: datadir
mountPath: /bitnami/mongodb
{{- if or (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|js]") (.Values.initConfigMap) }}
{{- if or (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|js|json]") (.Values.initConfigMap) }}
- name: custom-init-scripts
mountPath: /docker-entrypoint-initdb.d
{{- end }}
@@ -219,7 +219,7 @@ spec:
{{ toYaml .Values.metrics.resources | indent 12 }}
{{- end }}
volumes:
{{- if (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|js]") }}
{{- if (.Files.Glob "files/docker-entrypoint-initdb.d/*[sh|js|json]") }}
- name: custom-init-scripts
configMap:
name: {{ template "mongodb.fullname" . }}-init-scripts