From cc1cfc1e8d8c8081051d02bfe113828bc650e1bc Mon Sep 17 00:00:00 2001
From: Stanislav Zaprudskiy <stanislav.zaprudskiy@gmail.com>
Date: Fri, 4 Oct 2019 20:58:04 +0300
Subject: [PATCH] [stable/grafana] add namespace metadata for tests (#17695)

Signed-off-by: Stanislav Zaprudskiy <stanislav.zaprudskiy@gmail.com>
---
 stable/grafana/Chart.yaml                                  | 2 +-
 stable/grafana/templates/tests/test-configmap.yaml         | 1 +
 stable/grafana/templates/tests/test-podsecuritypolicy.yaml | 1 +
 stable/grafana/templates/tests/test-role.yaml              | 1 +
 stable/grafana/templates/tests/test-rolebinding.yaml       | 1 +
 stable/grafana/templates/tests/test-serviceaccount.yaml    | 1 +
 stable/grafana/templates/tests/test.yaml                   | 1 +
 7 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml
index 2ec2b83751..be9e444e34 100644
--- a/stable/grafana/Chart.yaml
+++ b/stable/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: grafana
-version: 3.8.17
+version: 3.8.18
 appVersion: 6.3.5
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
diff --git a/stable/grafana/templates/tests/test-configmap.yaml b/stable/grafana/templates/tests/test-configmap.yaml
index da800b04b2..25746ce0c5 100644
--- a/stable/grafana/templates/tests/test-configmap.yaml
+++ b/stable/grafana/templates/tests/test-configmap.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "grafana.fullname" . }}-test
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "grafana.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
diff --git a/stable/grafana/templates/tests/test-podsecuritypolicy.yaml b/stable/grafana/templates/tests/test-podsecuritypolicy.yaml
index 56f262bd05..c9245b24f9 100644
--- a/stable/grafana/templates/tests/test-podsecuritypolicy.yaml
+++ b/stable/grafana/templates/tests/test-podsecuritypolicy.yaml
@@ -3,6 +3,7 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "grafana.fullname" . }}-test
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "grafana.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
diff --git a/stable/grafana/templates/tests/test-role.yaml b/stable/grafana/templates/tests/test-role.yaml
index e950046d4f..c9e908e5f2 100644
--- a/stable/grafana/templates/tests/test-role.yaml
+++ b/stable/grafana/templates/tests/test-role.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ template "grafana.fullname" . }}-test
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "grafana.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
diff --git a/stable/grafana/templates/tests/test-rolebinding.yaml b/stable/grafana/templates/tests/test-rolebinding.yaml
index b558d7f2ff..746c27dc70 100644
--- a/stable/grafana/templates/tests/test-rolebinding.yaml
+++ b/stable/grafana/templates/tests/test-rolebinding.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ template "grafana.fullname" . }}-test
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "grafana.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
diff --git a/stable/grafana/templates/tests/test-serviceaccount.yaml b/stable/grafana/templates/tests/test-serviceaccount.yaml
index 5ecc9dfcf1..6e2cb0107f 100644
--- a/stable/grafana/templates/tests/test-serviceaccount.yaml
+++ b/stable/grafana/templates/tests/test-serviceaccount.yaml
@@ -8,4 +8,5 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
   name: {{ template "grafana.serviceAccountNameTest" . }}
+  namespace: {{ .Release.Namespace }}
 {{- end }}
diff --git a/stable/grafana/templates/tests/test.yaml b/stable/grafana/templates/tests/test.yaml
index ed36cb951d..69cce64fe8 100644
--- a/stable/grafana/templates/tests/test.yaml
+++ b/stable/grafana/templates/tests/test.yaml
@@ -9,6 +9,7 @@ metadata:
     release: "{{ .Release.Name }}"
   annotations:
     "helm.sh/hook": test-success
+  namespace: {{ .Release.Namespace }}
 spec:
   serviceAccountName: {{ template "grafana.serviceAccountNameTest" . }}
   {{- if .Values.testFramework.securityContext }}