feat: configure k8s watcher according to enableV1Services (#968)

Closes #962.

Also, add logging at startup (will list clusters and resources to watch).

Author: leafty

bases/renku_data_services/k8s_cache/config.py

@@ -50,6 +50,19 @@ def from_env(cls) -> "_ImageBuilderConfig":
         return cls(enabled=enabled)
 
 
+@dataclass
+class _V1ServicesConfig:
+    """Configuration for v1 services."""
+
+    enabled: bool
+
+    @classmethod
+    def from_env(cls) -> "_V1ServicesConfig":
+        """Load values from environment variables."""
+        enabled = os.environ.get("V1_SERVICES_ENABLED", "false").lower() == "true"
+        return cls(enabled=enabled)
+
+
 @dataclass
 class Config:
     """K8s cache config."""
@@ -58,19 +71,20 @@ class Config:
     k8s: _K8sConfig
     metrics: _MetricsConfig
     image_builders: _ImageBuilderConfig
+    v1_services: _V1ServicesConfig
 
     @classmethod
     def from_env(cls) -> "Config":
         """Create a config from environment variables."""
         db = DBConfig.from_env()
         k8s = _K8sConfig.from_env()
         metrics = _MetricsConfig.from_env()
-
         image_builders = _ImageBuilderConfig.from_env()
-
+        v1_services = _V1ServicesConfig.from_env()
         return cls(
             db=db,
             k8s=k8s,
             metrics=metrics,
             image_builders=image_builders,
+            v1_services=v1_services,
         )

bases/renku_data_services/k8s_cache/main.py

@@ -27,10 +27,14 @@ async def main() -> None:
         api=kr8s_api,
         cluster_rp=dm.cluster_repo(),
     )
+    logger.info(f"Clusters: {[str(c) for c in clusters]}")
 
-    kinds = [AMALTHEA_SESSION_GVK, JUPYTER_SESSION_GVK]
+    kinds = [AMALTHEA_SESSION_GVK]
+    if dm.config.v1_services.enabled:
+        kinds.append(JUPYTER_SESSION_GVK)
     if dm.config.image_builders.enabled:
         kinds.extend([BUILD_RUN_GVK, TASK_RUN_GVK])
+    logger.info(f"Resources: {kinds}")
     watcher = K8sWatcher(
         handler=k8s_object_handler(dm.k8s_cache, dm.metrics, rp_repo=dm.rp_repo),
         clusters={c.id: c for c in clusters},

components/renku_data_services/k8s/models.py

@@ -171,6 +171,10 @@ async def get_ingress_parameters(
 
         return base_server_path, base_server_url, base_server_https_url, host, tls_secret, ingress_annotations
 
+    def __str__(self) -> str:
+        api_url = repr(self.api.auth.server)
+        return f"{self.__class__.__name__}(id={self.id}, namespace={self.namespace}, api_url={api_url})"
+
 
 @dataclass(kw_only=True, frozen=True)
 class GVK: