From e2fd0b0d445193b719d5a3ad04b0c693114ba04b Mon Sep 17 00:00:00 2001
From: Anshul Verma <anshulvermapatel@gmail.com>
Date: Wed, 26 Feb 2025 21:17:54 +0530
Subject: [PATCH] added the orphaned namespace cleaner namespace definition

---
 .../integration/cluster-service-namespace.yaml       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/cluster-service/deploy/integration/cluster-service-namespace.yaml b/cluster-service/deploy/integration/cluster-service-namespace.yaml
index 4567dfc47..fd2e9b6c1 100644
--- a/cluster-service/deploy/integration/cluster-service-namespace.yaml
+++ b/cluster-service/deploy/integration/cluster-service-namespace.yaml
@@ -11,7 +11,7 @@ parameters:
   - name: CLIENT_ID
     description: The Azure Client ID used for federation
     required: true
-  - name: ORPHANED_NAMESPACE_CLEANER
+  - name: ORPHANED_NAMESPACE_CLEANER_NAMESPACE
     description: The namespace to create to have a cronjob which will delete the orphaned namespace which are not deleted due to any issues with the jenkins job.
     value: orphaned-namespace-cleaner
   - name: KUBECTL_IMAGE
@@ -78,11 +78,15 @@ objects:
       namespace: ${NAMESPACE}
     data:
       cs-client-id: ${CLIENT_ID}
+  - apiVersion: v1
+    kind: Namespace
+    metadata:
+      name: ${ORPHANED_NAMESPACE_CLEANER_NAMESPACE}
   - apiVersion: v1
     kind: ServiceAccount
     metadata:
       name: orphaned-namespace-cleaner-cronjob
-      namespace: ${ORPHANED_NAMESPACE_CLEANER}
+      namespace: ${ORPHANED_NAMESPACE_CLEANER_NAMESPACE}
   - apiVersion: rbac.authorization.k8s.io/v1
     kind: ClusterRoleBinding
     metadata:
@@ -90,7 +94,7 @@ objects:
     subjects:
       - kind: ServiceAccount
         name: orphaned-namespace-cleaner-cronjob
-        namespace: ${ORPHANED_NAMESPACE_CLEANER}
+        namespace: ${ORPHANED_NAMESPACE_CLEANER_NAMESPACE}
     roleRef:
       kind: ClusterRole
       name: namespace-admin
@@ -99,7 +103,7 @@ objects:
     kind: CronJob
     metadata:
       name: orphaned-namespace-cleaner
-      namespace: ${ORPHANED_NAMESPACE_CLEANER}
+      namespace: ${ORPHANED_NAMESPACE_CLEANER_NAMESPACE}
     spec:
       schedule: "0 0 * * *"
       successfulJobsHistoryLimit: 3