[stable/mongodb-replicaset] Namespace override (#21203)

Signed-off-by: Mohammad Forutan <mforutan@users.noreply.github.com>

stable/mongodb-replicaset/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 name: mongodb-replicaset
 home: https://github.com/mongodb/mongo
-version: 3.12.0
+version: 3.13.0
 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.

stable/mongodb-replicaset/README.md

@@ -111,6 +111,7 @@ The following table lists the configurable parameters of the mongodb chart and t
 | `extraVars`                         | Set environment variables for the main container                          | `{}`                                                |
 | `extraLabels`                       | Additional labels to add to resources                                     | `{}`                                                |
 | `extraVolumes`                      | Additional volumes to add to the resources                                | `[]`                                                |
+| `global.namespaceOverride`          | Override the deployment namespace                                         | Not set (`Release.Namespace`)                       |
 
 *MongoDB config file*
 

stable/mongodb-replicaset/templates/NOTES.txt

@@ -1,14 +1,14 @@
 1. After the statefulset is created completely, one can check which instance is primary by running:
 
-    $ for ((i = 0; i < {{ .Values.replicas }}; ++i)); do kubectl exec --namespace {{ .Release.Namespace }} {{ template "mongodb-replicaset.fullname" . }}-$i -- sh -c 'mongo --eval="printjson(rs.isMaster())"'; done
+    $ for ((i = 0; i < {{ .Values.replicas }}; ++i)); do kubectl exec --namespace {{ template "mongodb-replicaset.namespace" . }} {{ template "mongodb-replicaset.fullname" . }}-$i -- sh -c 'mongo --eval="printjson(rs.isMaster())"'; done
 
 2. One can insert a key into the primary instance of the mongodb replica set by running the following:
     MASTER_POD_NAME must be replaced with the name of the master found from the previous step.
 
-    $ kubectl exec --namespace {{ .Release.Namespace }} MASTER_POD_NAME -- mongo --eval="printjson(db.test.insert({key1: 'value1'}))"
+    $ kubectl exec --namespace {{ template "mongodb-replicaset.namespace" . }} MASTER_POD_NAME -- mongo --eval="printjson(db.test.insert({key1: 'value1'}))"
 
 3. One can fetch the keys stored in the primary or any of the slave nodes in the following manner.
     POD_NAME must be replaced by the name of the pod being queried.
 
-    $ kubectl exec --namespace {{ .Release.Namespace }} POD_NAME -- mongo --eval="rs.slaveOk(); db.test.find().forEach(printjson)"
+    $ kubectl exec --namespace {{ template "mongodb-replicaset.namespace" . }} POD_NAME -- mongo --eval="rs.slaveOk(); db.test.find().forEach(printjson)"
 

stable/mongodb-replicaset/templates/_helpers.tpl

@@ -76,3 +76,14 @@ Create the name for the key secret.
   {{- printf $string | quote -}}
   {{- end -}}
 {{- end -}}
+
+{{/*
+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 -}}
+  {{- else -}}
+    {{- .Release.Namespace -}}
+  {{- end -}}
+{{- end -}}

stable/mongodb-replicaset/templates/mongodb-admin-secret.yaml

@@ -11,6 +11,7 @@ metadata:
 {{ toYaml .Values.extraLabels | indent 4 }}
 {{- end }}
   name: {{ template "mongodb-replicaset.adminSecret" . }}
+  namespace: {{ template "mongodb-replicaset.namespace" . }}
 type: Opaque
 data:
   user: {{ .Values.auth.adminUser | b64enc }}

stable/mongodb-replicaset/templates/mongodb-ca-secret.yaml

@@ -12,6 +12,7 @@ metadata:
 {{ toYaml .Values.extraLabels | indent 4 }}
 {{- end }}
   name: {{ template "mongodb-replicaset.fullname" . }}-ca
+  namespace: {{ template "mongodb-replicaset.namespace" . }}
 data:
   tls.key: {{ .Values.tls.cakey }}
   tls.crt: {{ .Values.tls.cacert }}

stable/mongodb-replicaset/templates/mongodb-init-configmap.yaml

@@ -10,6 +10,7 @@ metadata:
 {{ toYaml .Values.extraLabels | indent 4 }}
 {{- end }}
   name: {{ template "mongodb-replicaset.fullname" . }}-init
+  namespace: {{ template "mongodb-replicaset.namespace" . }}
 data:
   on-start.sh: |
 {{ .Files.Get "init/on-start.sh" | indent 4 }}

stable/mongodb-replicaset/templates/mongodb-keyfile-secret.yaml

@@ -11,6 +11,7 @@ metadata:
 {{ toYaml .Values.extraLabels | indent 4 }}
 {{- end }}
   name: {{ template "mongodb-replicaset.keySecret" . }}
+  namespace: {{ template "mongodb-replicaset.namespace" . }}
 type: Opaque
 data:
   key.txt: {{ .Values.auth.key | b64enc }}

stable/mongodb-replicaset/templates/mongodb-metrics-secret.yaml

@@ -11,6 +11,7 @@ metadata:
 {{ toYaml .Values.extraLabels | indent 4 }}
 {{- end }}
   name: {{ template "mongodb-replicaset.metricsSecret" . }}
+  namespace: {{ template "mongodb-replicaset.namespace" . }}
 type: Opaque
 data:
   user: {{ .Values.auth.metricsUser | b64enc }}

stable/mongodb-replicaset/templates/mongodb-mongodb-configmap.yaml

@@ -10,6 +10,7 @@ metadata:
 {{ toYaml .Values.extraLabels | indent 4 }}
 {{- end }}
   name: {{ template "mongodb-replicaset.fullname" . }}-mongodb
+  namespace: {{ template "mongodb-replicaset.namespace" . }}
 data:
   mongod.conf: |
 {{ toYaml .Values.configmap | indent 4 }}

stable/mongodb-replicaset/templates/mongodb-poddisruptionbudget.yaml

@@ -11,6 +11,7 @@ metadata:
 {{ toYaml .Values.extraLabels | indent 4 }}
 {{- end }}
   name: {{ template "mongodb-replicaset.fullname" . }}
+  namespace: {{ template "mongodb-replicaset.namespace" . }}
 spec:
   selector:
     matchLabels:

stable/mongodb-replicaset/templates/mongodb-service-client.yaml

@@ -15,6 +15,7 @@ metadata:
 {{ toYaml .Values.extraLabels | indent 4 }}
 {{- end }}
   name: {{ template "mongodb-replicaset.fullname" . }}-client
+  namespace: {{ template "mongodb-replicaset.namespace" . }}
 spec:
   type: ClusterIP
   clusterIP: None

stable/mongodb-replicaset/templates/mongodb-service.yaml

@@ -13,6 +13,7 @@ metadata:
 {{ toYaml .Values.extraLabels | indent 4 }}
 {{- end }}
   name: {{ template "mongodb-replicaset.fullname" . }}
+  namespace: {{ template "mongodb-replicaset.namespace" . }}
 spec:
   type: ClusterIP
   clusterIP: None

stable/mongodb-replicaset/templates/mongodb-statefulset.yaml

@@ -14,6 +14,7 @@ metadata:
 {{ toYaml .Values.statefulSetAnnotations | indent 4 }}
 {{- end }}
   name: {{ template "mongodb-replicaset.fullname" . }}
+  namespace: {{ template "mongodb-replicaset.namespace" . }}
 spec:
   selector:
     matchLabels:

stable/mongodb-replicaset/templates/tests/mongodb-up-test-configmap.yaml

@@ -7,6 +7,7 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
   name: {{ template "mongodb-replicaset.fullname" . }}-tests
+  namespace: {{ template "mongodb-replicaset.namespace" . }}
 data:
   mongodb-up-test.sh: |
 {{ .Files.Get "tests/mongodb-up-test.sh" | indent 4 }}

stable/mongodb-replicaset/templates/tests/mongodb-up-test-pod.yaml

@@ -7,6 +7,7 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
   name: {{ template "mongodb-replicaset.fullname" . }}-test
+  namespace: {{ template "mongodb-replicaset.namespace" . }}
   annotations:
     "helm.sh/hook": test-success
 spec:

stable/mongodb-replicaset/values.yaml

@@ -2,6 +2,10 @@
 nameOverride: ""
 fullnameOverride: ""
 
+# Override the deployment namespace
+# global:
+#   namespaceOverride: ""
+
 replicas: 3
 port: 27017