Use use-istio config in charm.py (#323)

* Use use-istio config in charm.py
canonical · Nov 30, 2023 · 7484473 · 7484473
1 parent c93daa3
commit 7484473
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/charms/jupyter-controller/config.yaml b/charms/jupyter-controller/config.yaml
@@ -5,5 +5,5 @@ options:
     description: Enables culling of idle Jupyter pods
   use-istio:
     type: boolean
-    default: false
-    description: Manually enable Istio integration, instead of via relations
+    default: true
+    description: Should be set to true for kubeflow users. When set to false Istio's virtual services will not be created for notebooks 
diff --git a/charms/jupyter-controller/src/charm.py b/charms/jupyter-controller/src/charm.py
@@ -127,7 +127,7 @@ def service_environment(self):
         """Return environment variables based on model configuration."""
         config = self.model.config
         ret_env_vars = {
-            "USE_ISTIO": "true",
+            "USE_ISTIO": config["use-istio"],
             "ISTIO_GATEWAY": f"{self.model.name}/kubeflow-gateway",
             "ENABLE_CULLING": config["enable-culling"],
         }

diff --git a/charms/jupyter-ui/tests/integration/test_charm.py b/charms/jupyter-ui/tests/integration/test_charm.py
@@ -102,7 +102,7 @@ async def test_notebook_image_selector(ops_test: OpsTest, config_key, expected_i
         {config_key: yaml.dump(expected_images)}
     )
     await ops_test.model.wait_for_idle(
-        apps=[APP_NAME], status="active", raise_on_blocked=True, timeout=60 * 10, idle_period=30
+        apps=[APP_NAME], status="active", raise_on_blocked=True, timeout=60 * 10, idle_period=120
     )
     jupyter_ui_url = await get_unit_address(ops_test)
     response = await fetch_response(f"http://{jupyter_ui_url}:{PORT}/api/config", HEADERS)