Merge pull request #219 from percona/CLOUD-767-namespace-psmdb

CLOUD-767 - include Release.Namespace in metadata objects
percona · Sep 8, 2023 · 7c312ed · 7c312ed
2 parents 9945951 + 4f7a533
commit 7c312ed
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 6 deletions.
diff --git a/charts/psmdb-db/Chart.yaml b/charts/psmdb-db/Chart.yaml
@@ -3,9 +3,9 @@ appVersion: "1.14.0"
 description: A Helm chart for installing Percona Server MongoDB Cluster Databases using the PSMDB Operator.
 name: psmdb-db
 home: https://www.percona.com/doc/kubernetes-operator-for-psmongodb/index.html
-version: 1.14.3
+version: 1.14.4
 maintainers:
-  - name: cap1984
-    email: [email protected]
   - name: tplavcic
     email: [email protected]
+  - name: nmarukovich
+    email: [email protected]
diff --git a/charts/psmdb-db/templates/cluster-secret.yaml b/charts/psmdb-db/templates/cluster-secret.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "psmdb-database.fullname" . }}-secrets
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "psmdb-database.labels" . | indent 4 }}
 type: Opaque

diff --git a/charts/psmdb-db/templates/cluster.yaml b/charts/psmdb-db/templates/cluster.yaml
@@ -5,6 +5,7 @@ metadata:
     kubectl.kubernetes.io/last-applied-configuration: |
       {"apiVersion":"psmdb.percona.com/v1","kind":"PerconaServerMongoDB"}
   name: {{ include "psmdb-database.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "psmdb-database.labels" . | indent 4 }}
   finalizers:

diff --git a/charts/psmdb-operator/Chart.yaml b/charts/psmdb-operator/Chart.yaml
@@ -3,11 +3,11 @@ appVersion: "1.14.0"
 description: A Helm chart for deploying the Percona Operator for MongoDB
 name: psmdb-operator
 home: https://docs.percona.com/percona-operator-for-mongodb/
-version: 1.14.2
+version: 1.14.3
 maintainers:
-  - name: cap1984
-    email: [email protected]
   - name: tplavcic
     email: [email protected]
+  - name: nmarukovich
+    email: [email protected]
   - name: spron-in
     email: [email protected]
diff --git a/charts/psmdb-operator/templates/deployment.yaml b/charts/psmdb-operator/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "psmdb-operator.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "psmdb-operator.labels" . | indent 4 }}
 spec:

diff --git a/charts/psmdb-operator/templates/role-binding.yaml b/charts/psmdb-operator/templates/role-binding.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "psmdb-operator.fullname" . }}
+  namespace: {{ .Release.Namespace }}
 ---
 {{- end }}
 {{- if .Values.rbac.create }}
@@ -16,6 +17,8 @@ metadata:
   name: service-account-{{ include "psmdb-operator.fullname" . }}
   {{- if .Values.watchNamespace }}
   namespace: {{ .Values.watchNamespace }}
+  {{- else if not .Values.watchAllNamespaces }}
+  namespace: {{ .Release.Namespace }}
   {{- end }}
   labels:
 {{ include "psmdb-operator.labels" . | indent 4 }}

diff --git a/charts/psmdb-operator/templates/role.yaml b/charts/psmdb-operator/templates/role.yaml
@@ -7,6 +7,7 @@ kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ include "psmdb-operator.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "psmdb-operator.labels" . | indent 4 }}
 rules: