Fix a few things, change override args, pipe in extra_config

Author: dsubak

src/ol_infrastructure/applications/jupyterhub/__main__.py

@@ -1,5 +1,7 @@
 """JupyterHub application deployment for MIT Open Learning."""
 
+from pathlib import Path
+
 from pulumi import Config, StackReference
 from pulumi_aws import ec2
 
@@ -60,11 +62,10 @@
 
 # Check namespaces
 namespace = "jupyter"
+authoring_namespace = "jupyter-authoring"
 cluster_stack.require_output("namespaces").apply(
     lambda ns: check_cluster_namespace(namespace, ns)
 )
-
-authoring_namespace = "jupyter-authoring"
 cluster_stack.require_output("namespaces").apply(
     lambda ns: check_cluster_namespace(authoring_namespace, ns)
 )
@@ -173,6 +174,13 @@
     **rds_defaults,
 )
 
+menu_override = Path(__file__).parent.joinpath("menu_override.json").read_text()
+disabled_extensions = (
+    Path(__file__).parent.joinpath("disabled_extensions.json").read_text()
+)
+dynamic_image_config = (
+    Path(__file__).parent.joinpath("dynamicImageConfig.py").read_text()
+)
 # Provision main JupyterHub deployment
 jupyterhub_deployment = provision_jupyterhub_deployment(
     base_name="jupyterhub",
@@ -183,13 +191,21 @@
     vault_config=vault_config,
     db_config=jupyterhub_db_config,
     app_db=jupyterhub_db,
-    network_stack=network_stack,
     cluster_stack=cluster_stack,
     application_labels=application_labels,
     k8s_global_labels=k8s_global_labels,
     extra_images=EXTRA_IMAGES,
+    menu_override_json=menu_override,
+    disabled_extensions_json=disabled_extensions,
+    extra_config=dynamic_image_config,
 )
 
+author_menu_override = (
+    Path(__file__).parent.joinpath("author_menu_override.json").read_text()
+)
+author_disabled_extensions = (
+    Path(__file__).parent.joinpath("author_disabled_extensions.json").read_text()
+)
 # Provision JupyterHub authoring deployment
 jupyterhub_authoring_deployment = provision_jupyterhub_deployment(
     base_name="jupyterhub-authoring",
@@ -200,11 +216,11 @@
     vault_config=vault_config,
     db_config=jupyterhub_authoring_db_config,
     app_db=jupyterhub_db,
-    network_stack=network_stack,
     cluster_stack=cluster_stack,
     application_labels=application_labels,
     k8s_global_labels=k8s_global_labels,
     extra_images=EXTRA_IMAGES,
-    menu_override_file="author_menu_override.json",
-    disabled_extensions_file="author_disabled_extensions.json",
+    menu_override_json=author_menu_override,
+    disabled_extensions_json=author_disabled_extensions,
+    extra_config=dynamic_image_config,
 )

src/ol_infrastructure/applications/jupyterhub/deployment.py

@@ -46,8 +46,9 @@ def provision_jupyterhub_deployment(  # noqa: PLR0913
     application_labels: dict[str, str],
     k8s_global_labels: dict[str, str],
     extra_images: dict[str, dict[str, str]] | None = None,
-    menu_override_file: str = "menu_override.json",
-    disabled_extensions_file: str = "disabled_extensions.json",
+    menu_override_json: str | None = None,
+    disabled_extensions_json: str | None = None,
+    extra_config: str | None = None,
 ) -> kubernetes.helm.v3.Release:
     """Provision a JupyterHub deployment with all required AWS and Kubernetes resources.
 
@@ -60,17 +61,13 @@ def provision_jupyterhub_deployment(  # noqa: PLR0913
         stack_info: Stack information from parse_stack()
         jupyterhub_config: Pulumi config for jupyterhub
         vault_config: Pulumi config for vault
-        network_stack: Network stack reference
-        vault_stack: Vault stack reference
         cluster_stack: EKS cluster stack reference
-        aws_config: AWS configuration with tags
         application_labels: Labels to apply to Kubernetes resources
         k8s_global_labels: Global Kubernetes labels
         extra_images: List of extra images to pre-pull (optional)
-        menu_override_file: Path to menu override JSON file relative to
-            deployment directory
-        disabled_extensions_file: Path to disabled extensions JSON file
-            relative to deployment directory
+        menu_override_json: JSON contents for menu override Jupyter config
+        disabled_extensions_json: JSON contents for disabled extensions Jupyter config
+        extra_config: Extra configuration values to merge into the Helm chart values
 
     Returns:
         The JupyterHub Helm release resource
@@ -237,8 +234,7 @@ def provision_jupyterhub_deployment(  # noqa: PLR0913
     # JupyterHub Helm Release
     extra_images_list = extra_images or {}
     admin_users_list = jupyterhub_config.get_object("admin_users", default=[])
-    allowed_users_list = (jupyterhub_config.get_object("allowed_users", default=[]),)
-    #'jupyterhub-CI-application-helm-release'
+    allowed_users_list = jupyterhub_config.get_object("allowed_users", default=[])
     return kubernetes.helm.v3.Release(
         f"{base_name}-{env_name.upper()}-application-helm-release",
         kubernetes.helm.v3.ReleaseArgs(
@@ -327,11 +323,7 @@ def provision_jupyterhub_deployment(  # noqa: PLR0913
                             .read_text(),
                         }
                     },
-                    "extraConfig": {
-                        "dynamicImageConfig.py": Path(__file__)
-                        .parent.joinpath("dynamicImageConfig.py")
-                        .read_text()
-                    },
+                    "extraConfig": {"dynamicImageConfig.py": extra_config},
                     "config": {
                         "Authenticator": {
                             "admin_users": admin_users_list,
@@ -377,17 +369,13 @@ def provision_jupyterhub_deployment(  # noqa: PLR0913
                             "mountPath": (
                                 "/opt/conda/share/jupyter/lab/settings/overrides.json"
                             ),
-                            "stringData": Path(__file__)
-                            .parent.joinpath(menu_override_file)
-                            .read_text(),
+                            "stringData": menu_override_json,
                         },
                         "disabled_extensions": {
                             "mountPath": (
                                 "/home/jovyan/.jupyter/labconfig/page_config.json"
                             ),
-                            "stringData": Path(__file__)
-                            .parent.joinpath(disabled_extensions_file)
-                            .read_text(),
+                            "stringData": disabled_extensions_json,
                         },
                     },
                     "image": {