From f037d782fc8c6ab74b7ee5dfbb80cc0f2cf54dd6 Mon Sep 17 00:00:00 2001
From: Konstanty Karagiorgis <k.karagiorgis@piwik.pro>
Date: Thu, 26 Mar 2020 11:39:15 +0100
Subject: [PATCH] Introduced .Release.Namespace in objects meta

---
 bitnami/rabbitmq/Chart.yaml                    | 2 +-
 bitnami/rabbitmq/templates/certs.yaml          | 5 +++--
 bitnami/rabbitmq/templates/configuration.yaml  | 5 +++--
 bitnami/rabbitmq/templates/healthchecks.yaml   | 5 +++--
 bitnami/rabbitmq/templates/ingress.yaml        | 1 +
 bitnami/rabbitmq/templates/networkpolicy.yaml  | 1 +
 bitnami/rabbitmq/templates/pdb.yaml            | 5 +++--
 bitnami/rabbitmq/templates/role.yaml           | 1 +
 bitnami/rabbitmq/templates/rolebinding.yaml    | 1 +
 bitnami/rabbitmq/templates/secrets.yaml        | 2 ++
 bitnami/rabbitmq/templates/serviceaccount.yaml | 1 +
 bitnami/rabbitmq/templates/statefulset.yaml    | 1 +
 bitnami/rabbitmq/templates/svc-headless.yaml   | 1 +
 bitnami/rabbitmq/templates/svc.yaml            | 1 +
 14 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/bitnami/rabbitmq/Chart.yaml b/bitnami/rabbitmq/Chart.yaml
index 31a09aca749b5d..9cb306ef80c585 100644
--- a/bitnami/rabbitmq/Chart.yaml
+++ b/bitnami/rabbitmq/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: rabbitmq
-version: 6.20.1
+version: 6.21.0
 appVersion: 3.8.3
 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP)
 keywords:
diff --git a/bitnami/rabbitmq/templates/certs.yaml b/bitnami/rabbitmq/templates/certs.yaml
index 1aa999be049b8b..4cb2c598aa1176 100644
--- a/bitnami/rabbitmq/templates/certs.yaml
+++ b/bitnami/rabbitmq/templates/certs.yaml
@@ -3,11 +3,12 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "rabbitmq.fullname" . }}-certs
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "rabbitmq.name" . }}
     chart: {{ template "rabbitmq.chart" .  }}
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
 type: kubernetes.io/tls
 data:
   ca.crt:
diff --git a/bitnami/rabbitmq/templates/configuration.yaml b/bitnami/rabbitmq/templates/configuration.yaml
index acf71bb72b8a3d..6e1d64ba9f98f9 100644
--- a/bitnami/rabbitmq/templates/configuration.yaml
+++ b/bitnami/rabbitmq/templates/configuration.yaml
@@ -2,11 +2,12 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "rabbitmq.fullname" . }}-config
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "rabbitmq.name" . }}
     chart: {{ template "rabbitmq.chart" .  }}
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
 data:
   enabled_plugins: |-
 {{ template "rabbitmq.plugins" . }}
diff --git a/bitnami/rabbitmq/templates/healthchecks.yaml b/bitnami/rabbitmq/templates/healthchecks.yaml
index 8b5ed466bc9a0f..4031c23c667bd1 100644
--- a/bitnami/rabbitmq/templates/healthchecks.yaml
+++ b/bitnami/rabbitmq/templates/healthchecks.yaml
@@ -2,11 +2,12 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "rabbitmq.fullname" . }}-healthchecks
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "rabbitmq.name" . }}
     chart: {{ template "rabbitmq.chart" .  }}
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
 data:
   rabbitmq-health-check: |-
     #!/bin/sh
diff --git a/bitnami/rabbitmq/templates/ingress.yaml b/bitnami/rabbitmq/templates/ingress.yaml
index 4fa890d0026dc8..4d6f5cd8970463 100644
--- a/bitnami/rabbitmq/templates/ingress.yaml
+++ b/bitnami/rabbitmq/templates/ingress.yaml
@@ -3,6 +3,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: "{{ template "rabbitmq.fullname" . }}"
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: "{{ template "rabbitmq.name" . }}"
     chart: "{{ template "rabbitmq.chart" .  }}"
diff --git a/bitnami/rabbitmq/templates/networkpolicy.yaml b/bitnami/rabbitmq/templates/networkpolicy.yaml
index 6d0dc5a08086c7..16aaff96d1f588 100644
--- a/bitnami/rabbitmq/templates/networkpolicy.yaml
+++ b/bitnami/rabbitmq/templates/networkpolicy.yaml
@@ -3,6 +3,7 @@ kind: NetworkPolicy
 apiVersion: networking.k8s.io/v1
 metadata:
   name: {{ template "rabbitmq.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "rabbitmq.name" . }}
     chart: {{ template "rabbitmq.chart" . }}
diff --git a/bitnami/rabbitmq/templates/pdb.yaml b/bitnami/rabbitmq/templates/pdb.yaml
index 0e5f5448459b6e..c70791ded3ed45 100644
--- a/bitnami/rabbitmq/templates/pdb.yaml
+++ b/bitnami/rabbitmq/templates/pdb.yaml
@@ -3,11 +3,12 @@ apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "rabbitmq.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "rabbitmq.name" . }}
     chart: {{ template "rabbitmq.chart" .  }}
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
 spec:
   selector:
     matchLabels:
diff --git a/bitnami/rabbitmq/templates/role.yaml b/bitnami/rabbitmq/templates/role.yaml
index f4bea319cca2cf..8f6db71dd59b34 100644
--- a/bitnami/rabbitmq/templates/role.yaml
+++ b/bitnami/rabbitmq/templates/role.yaml
@@ -3,6 +3,7 @@ kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ template "rabbitmq.fullname" . }}-endpoint-reader
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "rabbitmq.name" . }}
     chart: {{ template "rabbitmq.chart" .  }}
diff --git a/bitnami/rabbitmq/templates/rolebinding.yaml b/bitnami/rabbitmq/templates/rolebinding.yaml
index bf315b5ea2e6aa..2b2dcd31875732 100644
--- a/bitnami/rabbitmq/templates/rolebinding.yaml
+++ b/bitnami/rabbitmq/templates/rolebinding.yaml
@@ -3,6 +3,7 @@ kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ template "rabbitmq.fullname" . }}-endpoint-reader
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "rabbitmq.name" . }}
     chart: {{ template "rabbitmq.chart" .  }}
diff --git a/bitnami/rabbitmq/templates/secrets.yaml b/bitnami/rabbitmq/templates/secrets.yaml
index 619215f3d5cabb..8f691608839ad4 100644
--- a/bitnami/rabbitmq/templates/secrets.yaml
+++ b/bitnami/rabbitmq/templates/secrets.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "rabbitmq.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "rabbitmq.name" . }}
     chart: {{ template "rabbitmq.chart" .  }}
@@ -27,6 +28,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ $key }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "rabbitmq.name" $ }}
     chart: {{ template "rabbitmq.chart" $ }}
diff --git a/bitnami/rabbitmq/templates/serviceaccount.yaml b/bitnami/rabbitmq/templates/serviceaccount.yaml
index ff361e4df8db9f..0b7079374de6f8 100644
--- a/bitnami/rabbitmq/templates/serviceaccount.yaml
+++ b/bitnami/rabbitmq/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "rabbitmq.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "rabbitmq.name" . }}
     chart: {{ template "rabbitmq.chart" .  }}
diff --git a/bitnami/rabbitmq/templates/statefulset.yaml b/bitnami/rabbitmq/templates/statefulset.yaml
index 08382f75a8403a..eb4bf7ad97a7c0 100644
--- a/bitnami/rabbitmq/templates/statefulset.yaml
+++ b/bitnami/rabbitmq/templates/statefulset.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ template "rabbitmq.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "rabbitmq.name" . }}
     chart: {{ template "rabbitmq.chart" .  }}
diff --git a/bitnami/rabbitmq/templates/svc-headless.yaml b/bitnami/rabbitmq/templates/svc-headless.yaml
index 14ad08e8ecc7ae..75fcb641eddc46 100644
--- a/bitnami/rabbitmq/templates/svc-headless.yaml
+++ b/bitnami/rabbitmq/templates/svc-headless.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "rabbitmq.fullname" . }}-headless
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "rabbitmq.name" . }}
     chart: {{ template "rabbitmq.chart" .  }}
diff --git a/bitnami/rabbitmq/templates/svc.yaml b/bitnami/rabbitmq/templates/svc.yaml
index f811a329fd6774..2887eb259ce8c9 100644
--- a/bitnami/rabbitmq/templates/svc.yaml
+++ b/bitnami/rabbitmq/templates/svc.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "rabbitmq.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "rabbitmq.name" . }}
     chart: {{ template "rabbitmq.chart" .  }}