From 62b4a04a9b3c23cfb539b95e7698b8397f0e0c9b Mon Sep 17 00:00:00 2001
From: Byron Maroney <bmaroney@ualberta.ca>
Date: Sun, 11 Jun 2023 18:25:37 +0000
Subject: [PATCH] Add support for custom namespace

---
 charts/easyauth-proxy/templates/_helpers.tpl        | 4 ++++
 charts/easyauth-proxy/templates/hpa.yaml            | 1 +
 charts/easyauth-proxy/templates/ingress.yaml        | 1 +
 charts/easyauth-proxy/templates/pvc.yaml            | 1 +
 charts/easyauth-proxy/templates/secret.yaml         | 2 +-
 charts/easyauth-proxy/templates/service.yaml        | 1 +
 charts/easyauth-proxy/templates/serviceaccount.yaml | 1 +
 charts/easyauth-proxy/templates/statefulset.yaml    | 1 +
 charts/easyauth-proxy/values.yaml                   | 2 ++
 9 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/charts/easyauth-proxy/templates/_helpers.tpl b/charts/easyauth-proxy/templates/_helpers.tpl
index ab78d32..776e36d 100644
--- a/charts/easyauth-proxy/templates/_helpers.tpl
+++ b/charts/easyauth-proxy/templates/_helpers.tpl
@@ -61,3 +61,7 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{- define "easyauth-proxy.namespace" -}}
+    {{ .Values.namespace | default .Release.Namespace }}
+{{- end -}}
diff --git a/charts/easyauth-proxy/templates/hpa.yaml b/charts/easyauth-proxy/templates/hpa.yaml
index 19dfe21..4f47876 100644
--- a/charts/easyauth-proxy/templates/hpa.yaml
+++ b/charts/easyauth-proxy/templates/hpa.yaml
@@ -3,6 +3,7 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "easyauth-proxy.fullname" . }}
+  namespace: {{ include "easyauth-proxy.namespace" . }}
   labels:
     {{- include "easyauth-proxy.labels" . | nindent 4 }}
 spec:
diff --git a/charts/easyauth-proxy/templates/ingress.yaml b/charts/easyauth-proxy/templates/ingress.yaml
index 9b4188d..e91c2c2 100644
--- a/charts/easyauth-proxy/templates/ingress.yaml
+++ b/charts/easyauth-proxy/templates/ingress.yaml
@@ -3,6 +3,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "easyauth-proxy.fullname" . }}-ingress
+  namespace: {{ include "easyauth-proxy.namespace" . }}
   labels:
     {{- include "easyauth-proxy.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
diff --git a/charts/easyauth-proxy/templates/pvc.yaml b/charts/easyauth-proxy/templates/pvc.yaml
index f6de314..d7030ee 100644
--- a/charts/easyauth-proxy/templates/pvc.yaml
+++ b/charts/easyauth-proxy/templates/pvc.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
     name: {{ .Values.claimName }}
+    namespace: {{ include "easyauth-proxy.namespace" . }}
 spec:
     accessModes:
     - ReadWriteMany
diff --git a/charts/easyauth-proxy/templates/secret.yaml b/charts/easyauth-proxy/templates/secret.yaml
index a04da62..d8e13e8 100644
--- a/charts/easyauth-proxy/templates/secret.yaml
+++ b/charts/easyauth-proxy/templates/secret.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Values.secret.name}}
-  namespace: default
+  namespace: {{ include "easyauth-proxy.namespace" . }}
 type: Opaque
 data:
   CLIENT_SECRET: {{ .Values.secret.azureclientsecret | b64enc }}
\ No newline at end of file
diff --git a/charts/easyauth-proxy/templates/service.yaml b/charts/easyauth-proxy/templates/service.yaml
index 52e14be..4812740 100644
--- a/charts/easyauth-proxy/templates/service.yaml
+++ b/charts/easyauth-proxy/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "easyauth-proxy.fullname" . }}
+  namespace: {{ include "easyauth-proxy.namespace" . }}
   labels:
     {{- include "easyauth-proxy.labels" . | nindent 4 }}
 spec:
diff --git a/charts/easyauth-proxy/templates/serviceaccount.yaml b/charts/easyauth-proxy/templates/serviceaccount.yaml
index fb18b7b..02302be 100644
--- a/charts/easyauth-proxy/templates/serviceaccount.yaml
+++ b/charts/easyauth-proxy/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "easyauth-proxy.serviceAccountName" . }}
+  namespace: {{ include "easyauth-proxy.namespace" . }}
   labels:
     {{- include "easyauth-proxy.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
diff --git a/charts/easyauth-proxy/templates/statefulset.yaml b/charts/easyauth-proxy/templates/statefulset.yaml
index b8114b0..5d0b200 100644
--- a/charts/easyauth-proxy/templates/statefulset.yaml
+++ b/charts/easyauth-proxy/templates/statefulset.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ include "easyauth-proxy.fullname" . }}
+  namespace: {{ include "easyauth-proxy.namespace" . }}
   labels:
     {{- include "easyauth-proxy.labels" . | nindent 4 }}
 spec:
diff --git a/charts/easyauth-proxy/values.yaml b/charts/easyauth-proxy/values.yaml
index 3faf968..420825f 100644
--- a/charts/easyauth-proxy/values.yaml
+++ b/charts/easyauth-proxy/values.yaml
@@ -18,6 +18,8 @@ imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
+namespace: ""
+
 serviceAccount:
   # Specifies whether a service account should be created
   create: true