From 4636c611c6fd7801fc8b7995fb2cf7e3cc206c81 Mon Sep 17 00:00:00 2001
From: Anthony LC <anthony.le-courric@mail.numerique.gouv.fr>
Date: Mon, 3 Jun 2024 10:16:29 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7(helm)=20add=20namespace=20to=20the?=
 =?UTF-8?q?=20templates?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The goal of adding a namespace in the templates
is to ensure that resources are deployed
in a specific, possibly isolated part of the Kubernetes cluster.
This helps in organizing resources, managing
permissions, and applying configurations or
limits appropriately within the cluster.
---
 src/helm/desk/templates/backend_deployment.yaml  | 1 +
 src/helm/desk/templates/backend_job.yaml         | 1 +
 src/helm/desk/templates/backend_svc.yaml         | 1 +
 src/helm/desk/templates/frontend_deployment.yaml | 1 +
 src/helm/desk/templates/frontend_svc.yaml        | 1 +
 src/helm/desk/templates/ingress.yaml             | 1 +
 src/helm/desk/templates/ingress_admin.yaml       | 1 +
 src/helm/desk/templates/secrets.yaml             | 1 +
 8 files changed, 8 insertions(+)

diff --git a/src/helm/desk/templates/backend_deployment.yaml b/src/helm/desk/templates/backend_deployment.yaml
index 55243d5..ddc88f2 100644
--- a/src/helm/desk/templates/backend_deployment.yaml
+++ b/src/helm/desk/templates/backend_deployment.yaml
@@ -5,6 +5,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "desk.common.labels" (list . $component) | nindent 4 }}
 spec:
diff --git a/src/helm/desk/templates/backend_job.yaml b/src/helm/desk/templates/backend_job.yaml
index 32e32d5..0bb8630 100644
--- a/src/helm/desk/templates/backend_job.yaml
+++ b/src/helm/desk/templates/backend_job.yaml
@@ -5,6 +5,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ $fullName }}-migrate
+  namespace: {{ .Release.Namespace | quote }}
   {{- with .Values.backend.migrateJobAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/src/helm/desk/templates/backend_svc.yaml b/src/helm/desk/templates/backend_svc.yaml
index b87678d..31e823a 100644
--- a/src/helm/desk/templates/backend_svc.yaml
+++ b/src/helm/desk/templates/backend_svc.yaml
@@ -5,6 +5,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "desk.common.labels" (list . $component) | nindent 4 }}
   annotations:
diff --git a/src/helm/desk/templates/frontend_deployment.yaml b/src/helm/desk/templates/frontend_deployment.yaml
index db9ae60..9bea804 100644
--- a/src/helm/desk/templates/frontend_deployment.yaml
+++ b/src/helm/desk/templates/frontend_deployment.yaml
@@ -5,6 +5,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "desk.common.labels" (list . $component) | nindent 4 }}
 spec:
diff --git a/src/helm/desk/templates/frontend_svc.yaml b/src/helm/desk/templates/frontend_svc.yaml
index 6a0413f..8df2220 100644
--- a/src/helm/desk/templates/frontend_svc.yaml
+++ b/src/helm/desk/templates/frontend_svc.yaml
@@ -5,6 +5,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "desk.common.labels" (list . $component) | nindent 4 }}
   annotations:
diff --git a/src/helm/desk/templates/ingress.yaml b/src/helm/desk/templates/ingress.yaml
index cc31dbb..fa6162c 100644
--- a/src/helm/desk/templates/ingress.yaml
+++ b/src/helm/desk/templates/ingress.yaml
@@ -15,6 +15,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "desk.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
diff --git a/src/helm/desk/templates/ingress_admin.yaml b/src/helm/desk/templates/ingress_admin.yaml
index de66e7a..3324fca 100644
--- a/src/helm/desk/templates/ingress_admin.yaml
+++ b/src/helm/desk/templates/ingress_admin.yaml
@@ -15,6 +15,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}-admin
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "desk.labels" . | nindent 4 }}
   {{- with .Values.ingressAdmin.annotations }}
diff --git a/src/helm/desk/templates/secrets.yaml b/src/helm/desk/templates/secrets.yaml
index 011f357..799bafe 100644
--- a/src/helm/desk/templates/secrets.yaml
+++ b/src/helm/desk/templates/secrets.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: backend
+  namespace: {{ .Release.Namespace | quote }}
 stringData:
   DJANGO_SUPERUSER_PASSWORD: {{ .Values.djangoSuperUserPass }}
   DJANGO_SECRET_KEY: {{ .Values.djangoSecretKey }}