Update manifests to v1.9.0

charms/jupyter-controller/config.yaml

@@ -1,8 +1,20 @@
 options:
+  cluster-domain:
+    type: string
+    default: cluster.local
+    description: Specifies the base domain name of the Kubernetes cluster, which is used in culling to correctly resolve and address the services and resources within the cluster.
+  cull-idle-time:
+    type: int
+    default: 1440
+    description: The amount of time (in seconds) that a Jupyter notebook server can remain idle before it is automatically shut down.
   enable-culling:
     type: boolean
     default: true
     description: Enables culling of idle Jupyter pods
+  idleness-check-period:
+    type: int
+    default: 1
+    description: Interval (in minutes) at which the system checks for idle Jupyter notebook servers to determine if they should be culled.
   use-istio:
     type: boolean
     default: true

charms/jupyter-controller/examples/sample-notebook.yaml

@@ -11,7 +11,7 @@ spec:
     spec:
       containers:
       - name: notebook
-        image: kubeflownotebookswg/jupyter-pytorch-full:v1.8.0
+        image: kubeflownotebookswg/jupyter-pytorch-full:v1.9.0-rc.0
         imagePullPolicy: IfNotPresent
         resources:
           requests:

charms/jupyter-controller/metadata.yaml

@@ -13,7 +13,7 @@ resources:
     type: oci-image
     description: 'Backing OCI image'
     auto-fetch: true
-    upstream-source: docker.io/kubeflownotebookswg/notebook-controller:v1.8.0
+    upstream-source: docker.io/kubeflownotebookswg/notebook-controller:v1.9.0-rc.0
 provides:
   metrics-endpoint:
     interface: prometheus_scrape

charms/jupyter-controller/src/charm.py

@@ -136,8 +136,12 @@ def service_environment(self):
         """Return environment variables based on model configuration."""
         config = self.model.config
         ret_env_vars = {
+            "CLUSTER_DOMAIN": config["cluster-domain"],
+            "CULL_IDLE_TIME": config["cull-idle-time"],
+            "IDLENESS_CHECK_PERIOD": config["idleness-check-period"],
             "USE_ISTIO": config["use-istio"],
             "ISTIO_GATEWAY": f"{self.model.name}/kubeflow-gateway",
+            "ISTIO_HOST": "*",
             "ENABLE_CULLING": config["enable-culling"],
         }
 

charms/jupyter-controller/src/templates/crds.yaml.j2

@@ -976,7 +976,9 @@ spec:
                               type: string
                           required:
                           - name
+                          - image
                           type: object
+                        minItems: 1
                         type: array
                       dnsConfig:
                         properties:
@@ -4105,7 +4107,9 @@ spec:
                               type: string
                           required:
                           - name
+                          - image
                           type: object
+                        minItems: 1
                         type: array
                       dnsConfig:
                         properties:
@@ -7234,7 +7238,9 @@ spec:
                               type: string
                           required:
                           - name
+                          - image
                           type: object
+                        minItems: 1
                         type: array
                       dnsConfig:
                         properties:

charms/jupyter-controller/tests/unit/test_operator.py

@@ -160,8 +160,8 @@ def test_pebble_layer(
         pebble_plan_info = pebble_plan.to_dict()
         assert pebble_plan_info["services"]["jupyter-controller"]["command"] == "./manager"
         test_env = pebble_plan_info["services"]["jupyter-controller"]["environment"]
-        # there should be 3 environment variables
-        assert 3 == len(test_env)
+        # there should be 7 environment variables
+        assert 7 == len(test_env)
         assert "kubeflow/kubeflow-gateway" == test_env["ISTIO_GATEWAY"]
 
     @patch("charm.KubernetesServicePatch", lambda *_, **__: None)

charms/jupyter-ui/config.yaml

@@ -25,21 +25,21 @@ options:
   jupyter-images:
     type: string
     default: |
-      - kubeflownotebookswg/jupyter-scipy:v1.8.0
-      - kubeflownotebookswg/jupyter-pytorch-full:v1.8.0
-      - kubeflownotebookswg/jupyter-pytorch-cuda-full:v1.8.0
-      - kubeflownotebookswg/jupyter-tensorflow-full:v1.8.0
-      - kubeflownotebookswg/jupyter-tensorflow-cuda-full:v1.8.0
+      - kubeflownotebookswg/jupyter-scipy:v1.9.0-rc.0
+      - kubeflownotebookswg/jupyter-pytorch-full:v1.9.0-rc.0
+      - kubeflownotebookswg/jupyter-pytorch-cuda-full:v1.9.0-rc.0
+      - kubeflownotebookswg/jupyter-tensorflow-full:v1.9.0-rc.0
+      - kubeflownotebookswg/jupyter-tensorflow-cuda-full:v1.9.0-rc.0
     description: list of image options for Jupyter Notebook
   vscode-images:
     type: string
     default: |
-      - kubeflownotebookswg/codeserver-python:v1.8.0
+      - kubeflownotebookswg/codeserver-python:v1.9.0-rc.0
     description: list of image options for VSCode
   rstudio-images:
     type: string
     default: |
-      - kubeflownotebookswg/rstudio-tidyverse:v1.8.0
+      - kubeflownotebookswg/rstudio-tidyverse:v1.9.0-rc.0
     description: list of image options for RStudio
   gpu-number-default:
     type: int

charms/jupyter-ui/metadata.yaml

@@ -12,7 +12,7 @@ resources:
   oci-image:
     type: oci-image
     description: 'Backing OCI image'
-    upstream-source: docker.io/charmedkubeflow/jupyter-web-app:1.8-2605035
+    upstream-source: docker.io/kubeflownotebookswg/jupyter-web-app:v1.9.0-rc.0
 requires:
   ingress:
     interface: ingress