From e5f85ae37bcafe748097967927f9fc1cb9bb63e3 Mon Sep 17 00:00:00 2001
From: Callum MacDonald <callum-macdonald-work@pm.me>
Date: Wed, 7 Dec 2022 09:11:46 +0100
Subject: [PATCH 1/2] Enable ability to override Release.Namespace for target
 namespace

---
 .../kubernetes/chart/reloader/templates/clusterrole.yaml      | 2 +-
 .../chart/reloader/templates/clusterrolebinding.yaml          | 4 ++--
 .../kubernetes/chart/reloader/templates/deployment.yaml       | 4 ++--
 deployments/kubernetes/chart/reloader/templates/role.yaml     | 2 +-
 .../kubernetes/chart/reloader/templates/rolebinding.yaml      | 4 ++--
 deployments/kubernetes/chart/reloader/templates/secret.yaml   | 4 ++--
 deployments/kubernetes/chart/reloader/templates/service.yaml  | 2 +-
 .../kubernetes/chart/reloader/templates/serviceaccount.yaml   | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml b/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml
index ac109e0e..5cba5caa 100644
--- a/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml
@@ -17,7 +17,7 @@ metadata:
 {{ toYaml .Values.reloader.matchLabels | indent 4 }}
 {{- end }}
   name: {{ template "reloader-fullname" . }}-role
-  namespace: {{ .Release.Namespace }}
+ namespace: {{ .Values.namespace | default .Release.Namespace }}
 rules:
   - apiGroups:
       - ""
diff --git a/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml b/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml
index 8488e3f8..f0611ec2 100644
--- a/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml
@@ -17,7 +17,7 @@ metadata:
 {{ toYaml .Values.reloader.matchLabels | indent 4 }}
 {{- end }}
   name: {{ template "reloader-fullname" . }}-role-binding
-  namespace: {{ .Release.Namespace }}
+ namespace: {{ .Values.namespace | default .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -25,5 +25,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ template "reloader-serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
+   namespace: {{ .Values.namespace | default .Release.Namespace }}
 {{- end }}
diff --git a/deployments/kubernetes/chart/reloader/templates/deployment.yaml b/deployments/kubernetes/chart/reloader/templates/deployment.yaml
index 14341b96..dd253842 100644
--- a/deployments/kubernetes/chart/reloader/templates/deployment.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/deployment.yaml
@@ -15,7 +15,7 @@ metadata:
 {{ toYaml .Values.reloader.matchLabels | indent 4 }}
 {{- end }}
   name: {{ template "reloader-fullname" . }}
-  namespace: {{ .Release.Namespace }}
+ namespace: {{ .Values.namespace | default .Release.Namespace }}
 spec:
 {{- if not (.Values.reloader.enableHA) }}
   replicas: 1
@@ -114,7 +114,7 @@ spec:
         ports:
         - name: http
           containerPort: 9091
-        - name: metrics 
+        - name: metrics
           containerPort: 9090
         livenessProbe:
           httpGet:
diff --git a/deployments/kubernetes/chart/reloader/templates/role.yaml b/deployments/kubernetes/chart/reloader/templates/role.yaml
index 2fd9e2bd..1eef9c93 100644
--- a/deployments/kubernetes/chart/reloader/templates/role.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/role.yaml
@@ -17,7 +17,7 @@ metadata:
 {{ toYaml .Values.reloader.matchLabels | indent 4 }}
 {{- end }}
   name: {{ template "reloader-fullname" . }}-role
-  namespace: {{ .Release.Namespace }}
+ namespace: {{ .Values.namespace | default .Release.Namespace }}
 rules:
   - apiGroups:
       - ""
diff --git a/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml b/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml
index dea3e8ad..e26c0b9b 100644
--- a/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml
@@ -17,7 +17,7 @@ metadata:
 {{ toYaml .Values.reloader.matchLabels | indent 4 }}
 {{- end }}
   name: {{ template "reloader-fullname" . }}-role-binding
-  namespace: {{ .Release.Namespace }}
+ namespace: {{ .Values.namespace | default .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -25,5 +25,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ template "reloader-serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
+   namespace: {{ .Values.namespace | default .Release.Namespace }}
 {{- end }}
diff --git a/deployments/kubernetes/chart/reloader/templates/secret.yaml b/deployments/kubernetes/chart/reloader/templates/secret.yaml
index a4f6ef34..26eff9c9 100644
--- a/deployments/kubernetes/chart/reloader/templates/secret.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/secret.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "reloader-fullname" . }}
-  namespace: {{ .Release.Namespace }}
+ namespace: {{ .Values.namespace | default .Release.Namespace }}
 type: Opaque
 data:
   {{ if .Values.reloader.deployment.env.secret.ALERT_ON_RELOAD -}}
@@ -18,4 +18,4 @@ data:
   {{- if .Values.reloader.deployment.env.secret.ALERT_ADDITIONAL_INFO -}}
   ALERT_ADDITIONAL_INFO: {{ .Values.reloader.deployment.env.secret.ALERT_ADDITIONAL_INFO | b64enc | quote }}
   {{ end }}
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/deployments/kubernetes/chart/reloader/templates/service.yaml b/deployments/kubernetes/chart/reloader/templates/service.yaml
index 9184491f..43c09e90 100644
--- a/deployments/kubernetes/chart/reloader/templates/service.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/service.yaml
@@ -13,7 +13,7 @@ metadata:
 {{ toYaml .Values.reloader.service.labels | indent 4 }}
 {{- end }}
   name: {{ template "reloader-fullname" . }}
-  namespace: {{ .Release.Namespace }}
+ namespace: {{ .Values.namespace | default .Release.Namespace }}
 spec:
   selector:
 {{- if .Values.reloader.deployment.labels }}
diff --git a/deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml b/deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml
index 22d3f2ee..7a635dbc 100644
--- a/deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml
@@ -22,5 +22,5 @@ metadata:
 {{ toYaml .Values.reloader.matchLabels | indent 4 }}
 {{- end }}
   name: {{ template "reloader-serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
+ namespace: {{ .Values.namespace | default .Release.Namespace }}
 {{- end }}

From 0ef5e7567306cf01af3664a0e4d054811ea8e39e Mon Sep 17 00:00:00 2001
From: Callum MacDonald <callum-macdonald-work@pm.me>
Date: Wed, 7 Dec 2022 09:18:15 +0100
Subject: [PATCH 2/2] fix indentation

---
 .../kubernetes/chart/reloader/templates/clusterrole.yaml      | 2 +-
 .../chart/reloader/templates/clusterrolebinding.yaml          | 4 ++--
 .../kubernetes/chart/reloader/templates/deployment.yaml       | 2 +-
 deployments/kubernetes/chart/reloader/templates/role.yaml     | 2 +-
 .../kubernetes/chart/reloader/templates/rolebinding.yaml      | 4 ++--
 deployments/kubernetes/chart/reloader/templates/secret.yaml   | 2 +-
 deployments/kubernetes/chart/reloader/templates/service.yaml  | 2 +-
 .../kubernetes/chart/reloader/templates/serviceaccount.yaml   | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml b/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml
index 5cba5caa..86b86daf 100644
--- a/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml
@@ -17,7 +17,7 @@ metadata:
 {{ toYaml .Values.reloader.matchLabels | indent 4 }}
 {{- end }}
   name: {{ template "reloader-fullname" . }}-role
- namespace: {{ .Values.namespace | default .Release.Namespace }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
 rules:
   - apiGroups:
       - ""
diff --git a/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml b/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml
index f0611ec2..0b7362b1 100644
--- a/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml
@@ -17,7 +17,7 @@ metadata:
 {{ toYaml .Values.reloader.matchLabels | indent 4 }}
 {{- end }}
   name: {{ template "reloader-fullname" . }}-role-binding
- namespace: {{ .Values.namespace | default .Release.Namespace }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -25,5 +25,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ template "reloader-serviceAccountName" . }}
-   namespace: {{ .Values.namespace | default .Release.Namespace }}
+    namespace: {{ .Values.namespace | default .Release.Namespace }}
 {{- end }}
diff --git a/deployments/kubernetes/chart/reloader/templates/deployment.yaml b/deployments/kubernetes/chart/reloader/templates/deployment.yaml
index dd253842..d1a8b72a 100644
--- a/deployments/kubernetes/chart/reloader/templates/deployment.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/deployment.yaml
@@ -15,7 +15,7 @@ metadata:
 {{ toYaml .Values.reloader.matchLabels | indent 4 }}
 {{- end }}
   name: {{ template "reloader-fullname" . }}
- namespace: {{ .Values.namespace | default .Release.Namespace }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
 spec:
 {{- if not (.Values.reloader.enableHA) }}
   replicas: 1
diff --git a/deployments/kubernetes/chart/reloader/templates/role.yaml b/deployments/kubernetes/chart/reloader/templates/role.yaml
index 1eef9c93..86e5e52a 100644
--- a/deployments/kubernetes/chart/reloader/templates/role.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/role.yaml
@@ -17,7 +17,7 @@ metadata:
 {{ toYaml .Values.reloader.matchLabels | indent 4 }}
 {{- end }}
   name: {{ template "reloader-fullname" . }}-role
- namespace: {{ .Values.namespace | default .Release.Namespace }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
 rules:
   - apiGroups:
       - ""
diff --git a/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml b/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml
index e26c0b9b..abeb721d 100644
--- a/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml
@@ -17,7 +17,7 @@ metadata:
 {{ toYaml .Values.reloader.matchLabels | indent 4 }}
 {{- end }}
   name: {{ template "reloader-fullname" . }}-role-binding
- namespace: {{ .Values.namespace | default .Release.Namespace }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -25,5 +25,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ template "reloader-serviceAccountName" . }}
-   namespace: {{ .Values.namespace | default .Release.Namespace }}
+    namespace: {{ .Values.namespace | default .Release.Namespace }}
 {{- end }}
diff --git a/deployments/kubernetes/chart/reloader/templates/secret.yaml b/deployments/kubernetes/chart/reloader/templates/secret.yaml
index 26eff9c9..21723092 100644
--- a/deployments/kubernetes/chart/reloader/templates/secret.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/secret.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "reloader-fullname" . }}
- namespace: {{ .Values.namespace | default .Release.Namespace }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
 type: Opaque
 data:
   {{ if .Values.reloader.deployment.env.secret.ALERT_ON_RELOAD -}}
diff --git a/deployments/kubernetes/chart/reloader/templates/service.yaml b/deployments/kubernetes/chart/reloader/templates/service.yaml
index 43c09e90..95a8150d 100644
--- a/deployments/kubernetes/chart/reloader/templates/service.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/service.yaml
@@ -13,7 +13,7 @@ metadata:
 {{ toYaml .Values.reloader.service.labels | indent 4 }}
 {{- end }}
   name: {{ template "reloader-fullname" . }}
- namespace: {{ .Values.namespace | default .Release.Namespace }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
 spec:
   selector:
 {{- if .Values.reloader.deployment.labels }}
diff --git a/deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml b/deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml
index 7a635dbc..27909edc 100644
--- a/deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml
@@ -22,5 +22,5 @@ metadata:
 {{ toYaml .Values.reloader.matchLabels | indent 4 }}
 {{- end }}
   name: {{ template "reloader-serviceAccountName" . }}
- namespace: {{ .Values.namespace | default .Release.Namespace }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
 {{- end }}