From c083c9f53b167976ffcbd27546aa3ffe2f59d70e Mon Sep 17 00:00:00 2001
From: Tim Weidner <tweidner@d2iq.com>
Date: Thu, 19 Sep 2019 17:08:20 +0200
Subject: [PATCH] Use .Release.Namespace

---
 stable/dex/templates/certificate.yaml                        | 4 ++--
 staging/cert-manager-setup/templates/clusterrolebinding.yaml | 4 ++--
 staging/cert-manager-setup/templates/issuers.yaml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/stable/dex/templates/certificate.yaml b/stable/dex/templates/certificate.yaml
index 71c37e7cc..afc98c7c0 100644
--- a/stable/dex/templates/certificate.yaml
+++ b/stable/dex/templates/certificate.yaml
@@ -2,7 +2,7 @@ apiVersion: certmanager.k8s.io/v1alpha1
 kind: Certificate
 metadata:
   name: dex
-  namespace: kubeaddons
+  namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/hook": pre-install
 spec:
@@ -12,7 +12,7 @@ spec:
     kind: ClusterIssuer
   commonName: dex
   organization:
-    - Mesosphere
+    - D2iQ
   dnsNames:
     - dex-kubeaddons
     - dex-kubeaddons.kubeaddons
diff --git a/staging/cert-manager-setup/templates/clusterrolebinding.yaml b/staging/cert-manager-setup/templates/clusterrolebinding.yaml
index 19c26432e..1600d6049 100644
--- a/staging/cert-manager-setup/templates/clusterrolebinding.yaml
+++ b/staging/cert-manager-setup/templates/clusterrolebinding.yaml
@@ -2,10 +2,10 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: read-apiservices-rolebinding
-  namespace: cert-manager
+  namespace: {{ .Release.Namespace }}
 subjects:
 - kind: ServiceAccount
-  namespace: cert-manager
+  namespace: {{ .Release.Namespace }}
   name: default
 roleRef:
   kind: ClusterRole
diff --git a/staging/cert-manager-setup/templates/issuers.yaml b/staging/cert-manager-setup/templates/issuers.yaml
index 619ca01ea..dbcf02361 100644
--- a/staging/cert-manager-setup/templates/issuers.yaml
+++ b/staging/cert-manager-setup/templates/issuers.yaml
@@ -3,7 +3,7 @@ apiVersion: certmanager.k8s.io/v1alpha1
 kind: Issuer
 metadata:
   name: kubernetes-root-issuer
-  namespace: cert-manager
+  namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/hook": "post-install"
     "helm.sh/hook-weight": "-4"