diff --git a/bitnami/mongodb/Chart.yaml b/bitnami/mongodb/Chart.yaml index d68512aaa1..afa498cd69 100644 --- a/bitnami/mongodb/Chart.yaml +++ b/bitnami/mongodb/Chart.yaml @@ -25,4 +25,4 @@ maintainers: name: mongodb sources: - https://github.com/bitnami/charts/tree/main/bitnami/mongodb -version: 13.14.0 +version: 13.14.1 diff --git a/bitnami/mongodb/templates/NOTES.txt b/bitnami/mongodb/templates/NOTES.txt index 31a5beb875..131a86b505 100644 --- a/bitnami/mongodb/templates/NOTES.txt +++ b/bitnami/mongodb/templates/NOTES.txt @@ -117,9 +117,9 @@ To connect to your database, create a MongoDB® client container: Then, run the following command: {{- if eq .Values.architecture "replicaset" }} - mongosh admin --host "{{ join "," $mongoList }}" {{- if .Values.auth.enabled }} --authenticationDatabase admin -u root -p $MONGODB_ROOT_PASSWORD{{- end }} + mongosh admin --host "{{ join "," $mongoList }}" {{- if .Values.auth.enabled }} --authenticationDatabase admin -u $MONGODB_ROOT_USER -p $MONGODB_ROOT_PASSWORD{{- end }} {{- else }} - mongosh admin --host "{{ template "mongodb.service.nameOverride" . }}" {{- if .Values.auth.enabled }} --authenticationDatabase admin -u root -p $MONGODB_ROOT_PASSWORD{{- end }} + mongosh admin --host "{{ template "mongodb.service.nameOverride" . }}" {{- if .Values.auth.enabled }} --authenticationDatabase admin -u $MONGODB_ROOT_USER -p $MONGODB_ROOT_PASSWORD{{- end }} {{- end }} {{- if and (eq .Values.architecture "replicaset") .Values.externalAccess.enabled }} diff --git a/bitnami/mongodb/templates/replicaset/scripts-configmap.yaml b/bitnami/mongodb/templates/replicaset/scripts-configmap.yaml index 1046188280..03a4784824 100644 --- a/bitnami/mongodb/templates/replicaset/scripts-configmap.yaml +++ b/bitnami/mongodb/templates/replicaset/scripts-configmap.yaml @@ -116,7 +116,7 @@ data: {{- range $e, $i := until $replicaCount }} {{- $mongoList = append $mongoList (printf "%s-%d.%s-headless.%s.svc.%s:%d" $fullname $i $fullname $releaseNamespace $clusterDomain $portNumber) }} {{- end }} - current_primary=$(mongosh admin --host "{{ join "," $mongoList }}" {{- if .Values.auth.enabled }} --authenticationDatabase admin -u root -p $MONGODB_ROOT_PASSWORD{{- end }}{{- if .Values.tls.enabled}} --tls --tlsCertificateKeyFile=/certs/mongodb.pem --tlsCAFile=/certs/mongodb-ca-cert{{- end }} --eval 'db.runCommand("ismaster")' | awk -F\' '/primary/ {print $2}') + current_primary=$(mongosh admin --host "{{ join "," $mongoList }}" {{- if .Values.auth.enabled }} --authenticationDatabase admin -u $MONGODB_ROOT_USER -p $MONGODB_ROOT_PASSWORD{{- end }}{{- if .Values.tls.enabled}} --tls --tlsCertificateKeyFile=/certs/mongodb.pem --tlsCAFile=/certs/mongodb-ca-cert{{- end }} --eval 'db.runCommand("ismaster")' | awk -F\' '/primary/ {print $2}') if ! is_empty_value "$current_primary"; then info "Detected existing primary: ${current_primary}" @@ -219,7 +219,7 @@ data: SLEEP_PERIOD=10 {{- if and .Values.auth.enabled .Values.auth.rootPassword }} - usernameAndPassword="-u root -p ${MONGODB_ROOT_PASSWORD}" + usernameAndPassword="-u ${$MONGODB_ROOT_USER} -p ${MONGODB_ROOT_PASSWORD}" {{- else }} usernameAndPassword="" {{- end }} diff --git a/bitnami/mongodb/templates/secrets.yaml b/bitnami/mongodb/templates/secrets.yaml index 551b7c15a9..e15fb6ba4c 100644 --- a/bitnami/mongodb/templates/secrets.yaml +++ b/bitnami/mongodb/templates/secrets.yaml @@ -90,10 +90,10 @@ data: type: {{ print "mongodb" | b64enc | quote }} host: {{ print $host | b64enc | quote }} port: {{ print $port | b64enc | quote }} - username: {{ print "root" | b64enc | quote }} + username: {{ print .Values.auth.rootUser | b64enc | quote }} password: {{ print $rootPassword | b64enc | quote }} database: {{ print "admin" | b64enc | quote }} - uri: {{ printf "mongodb://root:%s@%s/admin" $rootPassword $hostForURI | b64enc | quote }} + uri: {{ printf "mongodb://%s:%s@%s/admin" .Values.auth.rootUser $rootPassword $hostForURI | b64enc | quote }} {{- range $e, $i := until (len $customUsersList) }} --- apiVersion: v1