From 2ccf03f77252deb8012d2ce86e972d71b380cf71 Mon Sep 17 00:00:00 2001
From: Samuel Jones <samuel.jones@stfc.ac.uk>
Date: Fri, 5 Apr 2024 11:28:29 +0100
Subject: [PATCH] Use file watcher namespace for creds, and volume handle for
 PV

---
 file_watcher_operator/file_watcher_operator.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/file_watcher_operator/file_watcher_operator.py b/file_watcher_operator/file_watcher_operator.py
index 23821bc..e81d70d 100644
--- a/file_watcher_operator/file_watcher_operator.py
+++ b/file_watcher_operator/file_watcher_operator.py
@@ -38,12 +38,14 @@ def generate_deployment_body(
     db_ip = os.environ.get("DB_IP", "localhost")
     archive_pvc_name = f"{name}-file-watcher-pvc"
     archive_pv_name = f"{name}-file-watcher-pv"
+    namespace = os.environ.get("FILEWATCHER_NAMESPACE", "fia")
     deployment_spec = yaml.safe_load(
         f"""
             apiVersion: apps/v1
             kind: Deployment
             metadata:
               name: {name}-file-watcher-deployment
+              namespace: {namespace}
               labels:
                 app: {name}-file-watcher
             spec:
@@ -147,12 +149,12 @@ def generate_deployment_body(
               csi:
                 driver: smb.csi.k8s.io
                 readOnly: true
-                volumeHandle: archive.ir.svc.cluster.local/share##archive
+                volumeHandle: archive.{namespace}.svc.cluster.local/share##archive
                 volumeAttributes:
                   source: "//isisdatar55.isis.cclrc.ac.uk/inst$/"
                 nodeStageSecretRef:
                   name: archive-creds
-                  namespace: ir
+                  namespace: {namespace}
           """
     )