diff --git a/stable/mongodb-replicaset/Chart.yaml b/stable/mongodb-replicaset/Chart.yaml index dadf17dce3..8bae7b0576 100644 --- a/stable/mongodb-replicaset/Chart.yaml +++ b/stable/mongodb-replicaset/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: mongodb-replicaset home: https://github.com/mongodb/mongo -version: 3.14.0 +version: 3.14.1 appVersion: 3.6 description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications. diff --git a/stable/mongodb-replicaset/templates/_helpers.tpl b/stable/mongodb-replicaset/templates/_helpers.tpl index 17075b12fa..d9204a74c9 100644 --- a/stable/mongodb-replicaset/templates/_helpers.tpl +++ b/stable/mongodb-replicaset/templates/_helpers.tpl @@ -81,9 +81,13 @@ Create the name for the key secret. Allow the release namespace to be overridden for multi-namespace deployments in combined charts. */}} {{- define "mongodb-replicaset.namespace" -}} - {{- if and ((hasKey .Values "global") .Values.global.namespaceOverride) -}} - {{- .Values.global.namespaceOverride -}} + {{- if .Values.global -}} + {{- if .Values.global.namespaceOverride -}} + {{- .Values.global.namespaceOverride -}} + {{- else -}} + {{- .Release.Namespace -}} + {{- end -}} {{- else -}} {{- .Release.Namespace -}} - {{- end -}} -{{- end -}} \ No newline at end of file + {{- end -}} +{{- end -}} diff --git a/stable/mongodb-replicaset/values.yaml b/stable/mongodb-replicaset/values.yaml index eab257dd32..818fc6eb00 100644 --- a/stable/mongodb-replicaset/values.yaml +++ b/stable/mongodb-replicaset/values.yaml @@ -3,8 +3,8 @@ nameOverride: "" fullnameOverride: "" # Override the deployment namespace -# global: -# namespaceOverride: "" +global: +# namespaceOverride: "" replicas: 3 port: 27017