From d35f7a22fafcc6b0c990768b839b35f07f69f0e9 Mon Sep 17 00:00:00 2001
From: Steve Hipwell <steve.hipwell@gmail.com>
Date: Mon, 11 Jul 2022 09:25:11 +0100
Subject: [PATCH] fix[chart]: Remove namespace from cluster scoped resources

Signed-off-by: Steve Hipwell <steve.hipwell@gmail.com>
---
 charts/external-dns/CHANGELOG.md                      |  9 ++++++++-
 charts/external-dns/Chart.yaml                        | 11 ++---------
 charts/external-dns/templates/clusterrole.yaml        |  1 -
 charts/external-dns/templates/clusterrolebinding.yaml |  1 -
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/charts/external-dns/CHANGELOG.md b/charts/external-dns/CHANGELOG.md
index ad0f677c3c..98545c62df 100644
--- a/charts/external-dns/CHANGELOG.md
+++ b/charts/external-dns/CHANGELOG.md
@@ -10,10 +10,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <!-- ## [UNRELEASED]
 ### Added
 ### Changed
+### Fixed
 ### Deprecated
 ### Removed -->
 
-## [v1.10.0] - 2022-07-04
+## [v1.10.1] - 2022-07-11
+
+### Fixed
+
+- Fixed incorrect addition of `namespace` to `ClusterRole` & `ClusterRoleBinding`. [@stevehipwell](https://github.com/stevehipwell)
+
+## [v1.10.0] - 2022-07-08
 
 ### Added
 
diff --git a/charts/external-dns/Chart.yaml b/charts/external-dns/Chart.yaml
index 5be4944778..615883deee 100644
--- a/charts/external-dns/Chart.yaml
+++ b/charts/external-dns/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: external-dns
 description: ExternalDNS synchronizes exposed Kubernetes Services and Ingresses with DNS providers.
 type: application
-version: 1.10.0
+version: 1.10.1
 appVersion: 0.12.0
 keywords:
   - kubernetes
@@ -30,11 +30,4 @@ annotations:
         - name: Process Namespace Sharing
           url: https://kubernetes.io/docs/tasks/configure-pod-container/share-process-namespace/
     - kind: changed
-      description: "Update ExternalDNS version to v0.12.0"
-    - kind: changed
-      description: "Set resource namespaces to {{ .Release.Namespace }} in the templates instead of waiting until apply time for inference."
-    - kind: fixed
-      description: "Fixed rbac.additionalPermissions default value."
-      links:
-        - name: GitHub Issue #2796
-          url: https://github.com/kubernetes-sigs/external-dns/pull/2796
+      description: "Fixed incorrect addition of `namespace` to `ClusterRole` & `ClusterRoleBinding`."
diff --git a/charts/external-dns/templates/clusterrole.yaml b/charts/external-dns/templates/clusterrole.yaml
index b66021027a..8fcc15dced 100644
--- a/charts/external-dns/templates/clusterrole.yaml
+++ b/charts/external-dns/templates/clusterrole.yaml
@@ -3,7 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: {{ template "external-dns.fullname" . }}
-  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "external-dns.labels" . | nindent 4 }}
 rules:
diff --git a/charts/external-dns/templates/clusterrolebinding.yaml b/charts/external-dns/templates/clusterrolebinding.yaml
index 3ffd310eda..9028c6f962 100644
--- a/charts/external-dns/templates/clusterrolebinding.yaml
+++ b/charts/external-dns/templates/clusterrolebinding.yaml
@@ -3,7 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: {{ printf "%s-viewer" (include "external-dns.fullname" .) }}
-  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "external-dns.labels" . | nindent 4 }}
 roleRef: