Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-16 06:47:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/mongodb] fix: metric and reolicaset script issues with tls and mtls (#21383)

Browse Source
This commit is contained in:
emahdij
2023-12-05 11:29:38 +03:30
committed by GitHub
parent 97e852164a
commit 2573f2bebf
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/mongodb/Chart.yaml
View File

@@ -39,4 +39,4 @@ maintainers:
name: mongodb name: mongodb
sources: sources:
- https://github.com/bitnami/charts/tree/main/bitnami/mongodb - https://github.com/bitnami/charts/tree/main/bitnami/mongodb
version: 14.4.0 version: 14.4.1

14
bitnami/mongodb/templates/_helpers.tpl
View File

@@ -425,13 +425,19 @@ mongodb: tls.hidden.existingSecrets
Validate values of MongoDB® exporter URI string - auth.enabled and/or tls.enabled must be enabled or it defaults Validate values of MongoDB® exporter URI string - auth.enabled and/or tls.enabled must be enabled or it defaults
*/}} */}}
{{- define "mongodb.mongodb_exporter.uri" -}} {{- define "mongodb.mongodb_exporter.uri" -}}
{{- $uriTlsArgs := ternary "tls=true{{if .Values.tls.mTLS.enabled }}&tlsCertificateKeyFile=/certs/mongodb.pem{{ end }}&tlsCAFile=/certs/mongodb-ca-cert" "" .Values.tls.enabled -}} {{- $tlsEnabled := .Values.tls.enabled -}}
{{- if .Values.metrics.username }} {{- $mTlsEnabled := and $tlsEnabled .Values.tls.mTLS.enabled -}}
{{- $tlsArgs := "" -}}
{{- if $tlsEnabled -}}
{{- $tlsCertKeyFile := ternary "&tlsCertificateKeyFile=/certs/mongodb.pem" "" $mTlsEnabled -}}
{{- $tlsArgs = printf "tls=true%s&tlsCAFile=/certs/mongodb-ca-cert" $tlsCertKeyFile -}}
{{- end -}}
{{- if .Values.metrics.username -}}
{{- $uriAuth := ternary "$(echo $MONGODB_METRICS_USERNAME | sed -r \"s/@/%40/g;s/:/%3A/g\"):$(echo $MONGODB_METRICS_PASSWORD | sed -r \"s/@/%40/g;s/:/%3A/g\")@" "" .Values.auth.enabled -}} {{- $uriAuth := ternary "$(echo $MONGODB_METRICS_USERNAME | sed -r \"s/@/%40/g;s/:/%3A/g\"):$(echo $MONGODB_METRICS_PASSWORD | sed -r \"s/@/%40/g;s/:/%3A/g\")@" "" .Values.auth.enabled -}}
{{- printf "mongodb://%slocalhost:%d/admin?%s" $uriAuth (int .Values.containerPorts.mongodb) $uriTlsArgs -}} {{- printf "mongodb://%slocalhost:%d/admin?%s" $uriAuth (int .Values.containerPorts.mongodb) $tlsArgs -}}
{{- else -}} {{- else -}}
{{- $uriAuth := ternary "$MONGODB_ROOT_USER:$(echo $MONGODB_ROOT_PASSWORD | sed -r \"s/@/%40/g;s/:/%3A/g\")@" "" .Values.auth.enabled -}} {{- $uriAuth := ternary "$MONGODB_ROOT_USER:$(echo $MONGODB_ROOT_PASSWORD | sed -r \"s/@/%40/g;s/:/%3A/g\")@" "" .Values.auth.enabled -}}
{{- printf "mongodb://%slocalhost:%d/admin?%s" $uriAuth (int .Values.containerPorts.mongodb) $uriTlsArgs -}} {{- printf "mongodb://%slocalhost:%d/admin?%s" $uriAuth (int .Values.containerPorts.mongodb) $tlsArgs -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}

2
bitnami/mongodb/templates/replicaset/scripts-configmap.yaml
View File

@@ -225,7 +225,7 @@ data:
SLEEP_PERIOD=10 SLEEP_PERIOD=10
{{- if and .Values.auth.enabled .Values.auth.rootPassword }} {{- if and .Values.auth.enabled .Values.auth.rootPassword }}
usernameAndPassword="-u ${MONGODB_ROOT_USER} -p ${MONGODB_ROOT_PASSWORD}" usernameAndPassword="{{- if .Values.tls.enabled}} --tls {{ if .Values.tls.mTLS.enabled }}--tlsCertificateKeyFile=/certs/mongodb.pem {{ end }}--tlsCAFile=/certs/mongodb-ca-cert{{- end }} -u ${MONGODB_ROOT_USER} -p ${MONGODB_ROOT_PASSWORD}"
{{- else }} {{- else }}
usernameAndPassword="" usernameAndPassword=""
{{- end }} {{- end }}