Skip to content

Commit 33bbddd

Browse files
jotamartosBitnami Containers
andauthored
[bitnami/mongodb] Recover logging to stdout (#27510)
* [bitnami/mongodb] Recover logging to stdout Signed-off-by: Jota Martos <[email protected]> * [bitnami/mongodb] Undo some changes Signed-off-by: Jota Martos <[email protected]> * Update CHANGELOG.md Signed-off-by: Bitnami Containers <[email protected]> --------- Signed-off-by: Jota Martos <[email protected]> Signed-off-by: Bitnami Containers <[email protected]> Co-authored-by: Bitnami Containers <[email protected]>
1 parent 9169329 commit 33bbddd

File tree

6 files changed

+33
-9
lines changed

6 files changed

+33
-9
lines changed

bitnami/mongodb/CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Changelog
22

3-
## 15.6.10 (2024-06-20)
3+
## 15.6.11 (2024-06-24)
44

5-
* [bitnami/mongodb] add space back so script works again ([#27183](https://github.com/bitnami/charts/pull/27183))
5+
* [bitnami/mongodb] Recover logging to stdout ([#27510](https://github.com/bitnami/charts/pull/27510))
66

77
## <small>15.6.9 (2024-06-18)</small>
88

bitnami/mongodb/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ maintainers:
3939
name: mongodb
4040
sources:
4141
- https://github.com/bitnami/charts/tree/main/bitnami/mongodb
42-
version: 15.6.10
42+
version: 15.6.11

bitnami/mongodb/templates/_helpers.tpl

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,33 @@ Init container definition to change/establish volume permissions.
268268
mountPath: {{ .Values.persistence.mountPath }}
269269
{{- end -}}
270270

271+
{{/*
272+
Init container definition to recover log dir.
273+
*/}}
274+
{{- define "mongodb.initContainer.prepareLogDir" }}
275+
- name: log-dir
276+
image: {{ include "mongodb.image" . }}
277+
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
278+
command:
279+
- /bin/bash
280+
args:
281+
- -ec
282+
- |
283+
ln -sf /dev/stdout "/opt/bitnami/mongodb/logs/mongodb.log"
284+
{{- if .Values.containerSecurityContext.enabled }}
285+
securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.containerSecurityContext "context" $) | nindent 12 }}
286+
{{- end }}
287+
{{- if .Values.resources }}
288+
resources: {{- toYaml .Values.resources | nindent 12 }}
289+
{{- else if ne .Values.resourcesPreset "none" }}
290+
resources: {{- include "common.resources.preset" (dict "type" .Values.resourcesPreset) | nindent 12 }}
291+
{{- end }}
292+
volumeMounts:
293+
- name: empty-dir
294+
mountPath: /opt/bitnami/mongodb/logs
295+
subPath: app-logs-dir
296+
{{- end -}}
297+
271298
{{/*
272299
Init container definition to get external IP addresses.
273300
*/}}

bitnami/mongodb/templates/hidden/statefulset.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ spec:
8383
terminationGracePeriodSeconds: {{ .Values.hidden.terminationGracePeriodSeconds }}
8484
{{- end }}
8585
enableServiceLinks: {{ .Values.enableServiceLinks }}
86-
{{- if or .Values.hidden.initContainers (and .Values.volumePermissions.enabled .Values.hidden.persistence.enabled) (and .Values.externalAccess.hidden.enabled .Values.externalAccess.autoDiscovery.enabled) .Values.tls.enabled }}
8786
initContainers:
8887
{{- if .Values.hidden.initContainers }}
8988
{{- include "common.tplvalues.render" (dict "value" .Values.hidden.initContainers "context" $) | nindent 8 }}
@@ -97,6 +96,7 @@ spec:
9796
{{- if and .Values.externalAccess.enabled ( or .Values.externalAccess.service.publicNames .Values.externalAccess.service.domain ) }}
9897
{{- include "mongodb.initContainers.dnsCheck" . | indent 8 }}
9998
{{- end }}
99+
{{- include "mongodb.initContainer.prepareLogDir" . | nindent 8 }}
100100
{{- if .Values.tls.enabled }}
101101
- name: generate-tls-certs
102102
image: {{ include "mongodb.tls.image" . }}
@@ -147,7 +147,6 @@ spec:
147147
resources: {{- include "common.resources.preset" (dict "type" .Values.tls.resourcesPreset) | nindent 12 }}
148148
{{- end }}
149149
{{- end }}
150-
{{- end }}
151150
containers:
152151
- name: mongodb
153152
image: {{ include "mongodb.image" . }}

bitnami/mongodb/templates/replicaset/statefulset.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ spec:
8484
terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
8585
{{- end }}
8686
enableServiceLinks: {{ .Values.enableServiceLinks }}
87-
{{- if or .Values.initContainers (and .Values.volumePermissions.enabled .Values.persistence.enabled) (and .Values.externalAccess.enabled (or .Values.externalAccess.autoDiscovery.enabled .Values.externalAccess.service.publicNames .Values.externalAccess.service.domain)) .Values.tls.enabled }}
8887
initContainers:
8988
{{- if .Values.initContainers }}
9089
{{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
@@ -98,6 +97,7 @@ spec:
9897
{{- if and .Values.externalAccess.enabled ( or .Values.externalAccess.service.publicNames .Values.externalAccess.service.domain ) }}
9998
{{- include "mongodb.initContainers.dnsCheck" . | nindent 8 }}
10099
{{- end }}
100+
{{- include "mongodb.initContainer.prepareLogDir" . | nindent 8 }}
101101
{{- if .Values.tls.enabled }}
102102
- name: generate-tls-certs
103103
image: {{ include "mongodb.tls.image" . }}
@@ -151,7 +151,6 @@ spec:
151151
securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.tls.securityContext "context" $) | nindent 12 }}
152152
{{- end }}
153153
{{- end }}
154-
{{- end }}
155154
containers:
156155
- name: mongodb
157156
image: {{ include "mongodb.image" . }}

bitnami/mongodb/templates/standalone/dep-sts.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,14 @@ spec:
8383
terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
8484
{{- end }}
8585
enableServiceLinks: {{ .Values.enableServiceLinks }}
86-
{{- if or .Values.initContainers (and .Values.volumePermissions.enabled .Values.persistence.enabled) .Values.tls.enabled }}
8786
initContainers:
8887
{{- if .Values.initContainers }}
8988
{{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
9089
{{- end }}
9190
{{- if and .Values.volumePermissions.enabled .Values.persistence.enabled }}
9291
{{- include "mongodb.initContainer.volumePermissions" . | indent 8 }}
9392
{{- end }}
93+
{{- include "mongodb.initContainer.prepareLogDir" . | nindent 8 }}
9494
{{- if .Values.tls.enabled }}
9595
- name: generate-tls-certs
9696
image: {{ include "mongodb.tls.image" . }}
@@ -138,7 +138,6 @@ spec:
138138
securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.tls.securityContext "context" $) | nindent 12 }}
139139
{{- end }}
140140
{{- end }}
141-
{{- end }}
142141
containers:
143142
- name: mongodb
144143
image: {{ include "mongodb.image" . }}

0 commit comments

Comments
 (0)