From 39ec8d6dec88339da666abf036c78e7fdd41a3cd Mon Sep 17 00:00:00 2001 From: Liu Feifei Date: Mon, 23 Mar 2020 17:10:26 +0800 Subject: [PATCH] [bitnami/mongodb] Issue 2096. Encode @ : in username / password when connect to mongo (#2099) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Issue 2096. Encode @ : in username / password when connect to mongo * Issue 2096. Issue 2096. Encode @ : in username / password when connect to mongo * Issue 2096. Bump mongodb chart version : 7.8.10 -> 7.8.11 Co-authored-by: feifei-liu Co-authored-by: Andrés Bono --- .../templates/config-server/config-server-statefulset.yaml | 2 +- bitnami/mongodb-sharded/templates/mongos/mongos-deployment.yaml | 2 +- .../mongodb-sharded/templates/shard/shard-data-statefulset.yaml | 2 +- bitnami/mongodb/Chart.yaml | 2 +- bitnami/mongodb/templates/statefulset-primary-rs.yaml | 2 +- bitnami/mongodb/templates/statefulset-secondary-rs.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bitnami/mongodb-sharded/templates/config-server/config-server-statefulset.yaml b/bitnami/mongodb-sharded/templates/config-server/config-server-statefulset.yaml index 9a7a84b33..f8af6f0a0 100644 --- a/bitnami/mongodb-sharded/templates/config-server/config-server-statefulset.yaml +++ b/bitnami/mongodb-sharded/templates/config-server/config-server-statefulset.yaml @@ -238,7 +238,7 @@ spec: {{- if .Values.usePasswordFile }} export MONGODB_ROOT_PASSWORD="$(< "${MONGODB_ROOT_PASSWORD_FILE}")" {{- end }} - /bin/mongodb_exporter --mongodb.uri mongodb://root:${MONGODB_ROOT_PASSWORD}@localhost:{{ .Values.service.port }}/admin {{ .Values.metrics.extraArgs }} + /bin/mongodb_exporter --mongodb.uri mongodb://root:`echo $MONGODB_ROOT_PASSWORD | sed -r "s/@/%40/g;s/:/%3A/g"`@localhost:{{ .Values.service.port }}/admin {{ .Values.metrics.extraArgs }} {{- if .Values.usePasswordFile }} volumeMounts: - name: secrets diff --git a/bitnami/mongodb-sharded/templates/mongos/mongos-deployment.yaml b/bitnami/mongodb-sharded/templates/mongos/mongos-deployment.yaml index 96b633035..8bbf97178 100644 --- a/bitnami/mongodb-sharded/templates/mongos/mongos-deployment.yaml +++ b/bitnami/mongodb-sharded/templates/mongos/mongos-deployment.yaml @@ -226,7 +226,7 @@ spec: {{- if .Values.usePasswordFile }} export MONGODB_ROOT_PASSWORD="$(< "${MONGODB_ROOT_PASSWORD_FILE}")" {{- end }} - /bin/mongodb_exporter --mongodb.uri mongodb://root:${MONGODB_ROOT_PASSWORD}@localhost:{{ .Values.service.port }}/admin {{ .Values.metrics.extraArgs }} + /bin/mongodb_exporter --mongodb.uri mongodb://root:`echo $MONGODB_ROOT_PASSWORD | sed -r "s/@/%40/g;s/:/%3A/g"`@localhost:{{ .Values.service.port }}/admin {{ .Values.metrics.extraArgs }} {{- if .Values.usePasswordFile }} volumeMounts: - name: secrets diff --git a/bitnami/mongodb-sharded/templates/shard/shard-data-statefulset.yaml b/bitnami/mongodb-sharded/templates/shard/shard-data-statefulset.yaml index 5d8e434ad..43e38f0eb 100644 --- a/bitnami/mongodb-sharded/templates/shard/shard-data-statefulset.yaml +++ b/bitnami/mongodb-sharded/templates/shard/shard-data-statefulset.yaml @@ -217,7 +217,7 @@ spec: {{- if $.Values.usePasswordFile }} export MONGODB_ROOT_PASSWORD="$(< "${MONGODB_ROOT_PASSWORD_FILE}")" {{- end }} - /bin/mongodb_exporter --mongodb.uri mongodb://root:${MONGODB_ROOT_PASSWORD}@localhost:{{ $.Values.service.port }}/admin {{ $.Values.metrics.extraArgs }} + /bin/mongodb_exporter --mongodb.uri mongodb://root:`echo $MONGODB_ROOT_PASSWORD | sed -r "s/@/%40/g;s/:/%3A/g"`@localhost:{{ $.Values.service.port }}/admin {{ $.Values.metrics.extraArgs }} {{- if $.Values.usePasswordFile }} volumeMounts: - name: secrets diff --git a/bitnami/mongodb/Chart.yaml b/bitnami/mongodb/Chart.yaml index fad7c8443..c0e4a4806 100644 --- a/bitnami/mongodb/Chart.yaml +++ b/bitnami/mongodb/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: mongodb -version: 7.9.0 +version: 7.9.1 appVersion: 4.2.4 description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications. keywords: diff --git a/bitnami/mongodb/templates/statefulset-primary-rs.yaml b/bitnami/mongodb/templates/statefulset-primary-rs.yaml index 1031b3a9e..dbfe0616c 100644 --- a/bitnami/mongodb/templates/statefulset-primary-rs.yaml +++ b/bitnami/mongodb/templates/statefulset-primary-rs.yaml @@ -230,7 +230,7 @@ spec: secretKeyRef: name: {{ if .Values.existingSecret }}{{ .Values.existingSecret }}{{- else }}{{ template "mongodb.fullname" . }}{{- end }} key: mongodb-root-password - command: [ 'sh', '-c', '/bin/mongodb_exporter --mongodb.uri mongodb://root:${MONGODB_ROOT_PASSWORD}@localhost:{{ .Values.service.port }}/admin {{ .Values.metrics.extraArgs }}' ] + command: [ 'sh', '-c', '/bin/mongodb_exporter --mongodb.uri mongodb://root:`echo $MONGODB_ROOT_PASSWORD | sed -r "s/@/%40/g;s/:/%3A/g"`@localhost:{{ .Values.service.port }}/admin {{ .Values.metrics.extraArgs }}' ] {{- else }} command: [ 'sh', '-c', '/bin/mongodb_exporter --mongodb.uri mongodb://localhost:{{ .Values.service.port }} {{ .Values.metrics.extraArgs }}' ] {{- end }} diff --git a/bitnami/mongodb/templates/statefulset-secondary-rs.yaml b/bitnami/mongodb/templates/statefulset-secondary-rs.yaml index 8d878cac3..aa0097b0a 100644 --- a/bitnami/mongodb/templates/statefulset-secondary-rs.yaml +++ b/bitnami/mongodb/templates/statefulset-secondary-rs.yaml @@ -214,7 +214,7 @@ spec: secretKeyRef: name: {{ if .Values.existingSecret }}{{ .Values.existingSecret }}{{- else }}{{ template "mongodb.fullname" . }}{{- end }} key: mongodb-root-password - command: [ 'sh', '-c', '/bin/mongodb_exporter --mongodb.uri mongodb://root:${MONGODB_ROOT_PASSWORD}@localhost:{{ .Values.service.port }}/admin {{ .Values.metrics.extraArgs }}' ] + command: [ 'sh', '-c', '/bin/mongodb_exporter --mongodb.uri mongodb://root:`echo $MONGODB_ROOT_PASSWORD | sed -r "s/@/%40/g;s/:/%3A/g"`@localhost:{{ .Values.service.port }}/admin {{ .Values.metrics.extraArgs }}' ] {{- else }} command: [ 'sh', '-c', '/bin/mongodb_exporter --mongodb.uri mongodb://localhost:{{ .Values.service.port }} {{ .Values.metrics.extraArgs }}' ] {{- end }}