Rename

.github/workflows/formatting.yml

@@ -1,7 +1,7 @@
 ---
 on:
   push:
-    branches:
+    branches-ignore:
       - main
 permissions:
   contents: write

.gitignore

@@ -1,8 +1,5 @@
 .idea/
-ir_api.egg-info/
 
-ir_api/local_scripts/*
-!ir_api/local_scripts/.keep
 
  Byte-compiled / optimized / DLL files
 __pycache__/

README.md

@@ -23,15 +23,15 @@ Login using docker login
 
 Then build and push the file-watcher container
 ```shell
-docker build . -f ./container/file_watcher.D -t ghcr.io/interactivereduction/filewatcher
-docker push ghcr.io/interactivereduction/filewatcher -a
+docker build . -f ./container/file_watcher.D -t ghcr.io/fiaisis/filewatcher
+docker push ghcr.io/fiaisis/filewatcher -a
 ```
 
 Then build and push the file-watcher-operator container
 
 ```shell
-docker build . -f ./container/file_watcher_operator.D -t ghcr.io/interactivereduction/filewatcher-operator
-docker push ghcr.io/interactivereduction/filewatcher-operator -a
+docker build . -f ./container/file_watcher_operator.D -t ghcr.io/fiaisis/filewatcher-operator
+docker push ghcr.io/fiaisis/filewatcher-operator -a
 ```
 
 The file-watcher container, when updated needs to be updated in each of the CRDs controlled by the file watcher operator.

file_watcher/database/db_updater.py

@@ -33,7 +33,7 @@ class DBUpdater:
     """
 
     def __init__(self, ip: str, username: str, password: str):
-        connection_string = f"postgresql+psycopg2://{username}:{password}@{ip}:5432/interactive-reduction"
+        connection_string = f"postgresql+psycopg2://{username}:{password}@{ip}:5432/fia"
         engine = create_engine(connection_string, poolclass=QueuePool, pool_size=20, pool_pre_ping=True)
         self.session_maker_func = sessionmaker(bind=engine)
 

file_watcher/lastrun_file_monitor.py

@@ -47,8 +47,7 @@ def __init__(
         self.db_updater = DBUpdater(ip=db_ip, username=db_username, password=db_password)
         self.latest_known_run_from_db = self.get_latest_run_from_db()
         logger.info("Last run in DB is: %s", self.latest_known_run_from_db)
-        if (self.latest_known_run_from_db is None
-                or self.latest_known_run_from_db == 'None'):
+        if self.latest_known_run_from_db is None or self.latest_known_run_from_db == "None":
             logger.info("Adding latest run to DB as there is no data: %s", self.last_recorded_run_from_file)
             self.update_db_with_latest_run(self.last_recorded_run_from_file)
             self.latest_known_run_from_db = self.last_recorded_run_from_file

file_watcher_operator/file_watcher_operator.py

@@ -58,7 +58,7 @@ def generate_deployment_body(
                 spec:
                   containers:
                   - name: {name}-file-watcher
-                    image: ghcr.io/interactivereduction/filewatcher@sha256:{file_watcher_sha}
+                    image: ghcr.io/fiaisis/filewatcher@sha256:{file_watcher_sha}
                     env:
                     - name: QUEUE_HOST
                       value: {queue_host}
@@ -170,7 +170,7 @@ def deploy_deployment(deployment_spec: Mapping[str, Any], name: str, children: L
     """
     app_api = kubernetes.client.AppsV1Api()
     logger.info("Starting deployment of: %s filewatcher", name)
-    namespace = os.environ.get("FILEWATCHER_NAMESPACE", "ir")
+    namespace = os.environ.get("FILEWATCHER_NAMESPACE", "fia")
     depl = app_api.create_namespaced_deployment(namespace=namespace, body=deployment_spec)
     children.append(depl.metadata.uid)
     logger.info("Deployed: %s filewatcher", name)
@@ -185,7 +185,7 @@ def deploy_pvc(pvc_spec: Mapping[str, Any], name: str, children: List[Any]) -> N
     :param children: The operators children
     :return: None
     """
-    namespace = os.environ.get("FILEWATCHER_NAMESPACE", "ir")
+    namespace = os.environ.get("FILEWATCHER_NAMESPACE", "fia")
     core_api = kubernetes.client.CoreV1Api()
     # Check if PVC exists else deploy a new one:
     if pvc_spec["metadata"]["name"] not in [
@@ -216,7 +216,7 @@ def deploy_pv(pv_spec: Mapping[str, Any], name: str, children: List[Any]) -> Non
         logger.info("Deployed PV: %s filewatcher", name)
 
 
-@kopf.on.create("ir.com", "v1", "filewatchers")
+@kopf.on.create("fia.com", "v1", "filewatchers")
 def create_fn(spec: Any, **kwargs: Any) -> Dict[str, List[Any]]:
     """
     Kopf create event handler, generates all 3 specs then creates them in the cluster, while creating the children and
@@ -241,7 +241,7 @@ def create_fn(spec: Any, **kwargs: Any) -> Dict[str, List[Any]]:
     return {"children": children}
 
 
-@kopf.on.delete("ir.com", "v1", "filewatchers")
+@kopf.on.delete("fia.com", "v1", "filewatchers")
 def delete_func(**kwargs: Any) -> None:
     """
     Kopf delete event handler. This will automatically delete the filewatcher deployment and pvc, and will manually
@@ -254,7 +254,7 @@ def delete_func(**kwargs: Any) -> None:
     client.delete_persistent_volume(name=f"{name}-file-watcher-pv")
 
 
-@kopf.on.update("ir.com", "v1", "filewatchers")
+@kopf.on.update("fia.com", "v1", "filewatchers")
 def update_func(spec: Any, **kwargs: Any) -> None:
     """
     kopf update event handler. This automatically updates the filewatcher deployment when the CRD changes

pyproject.toml

@@ -9,7 +9,7 @@ dependencies = [
 ]
 
 [project.urls]
-"Repository" = "https://github.com/interactivereduction/file-watcher"
+"Repository" = "https://github.com/fiaisis/file-watcher"
 
 [project.scripts]
 file_watcher = "file_watcher.main:main"