Removing custom dask_gateway from qhub

Closes #1012
nebari-dev · Mar 8, 2022 · 9e3cf66 · 9e3cf66
1 parent 3fc25e3
commit 9e3cf66
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 118 deletions.
diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
@@ -27,7 +27,6 @@ jobs:
           - jupyterlab
           - jupyterhub
           - dask-worker
-          - dask-gateway
     steps:
       - name: 'Checkout Infrastructure'
         uses: actions/checkout@main

diff --git a/docs/source/installation/configuration.md b/docs/source/installation/configuration.md
@@ -502,16 +502,14 @@ terraform_state:
 Default images are to the default image run if not specified in a
 profile (described in the next section). The `jupyterhub` key controls
 the jupyterhub image run. These control the docker image used to run
-JupyterHub, the default JupyterLab image, the default Dask worker
-image, and Dask Gateway docker image.
+JupyterHub, the default JupyterLab image, and the default Dask worker
+image.
 
 ```yaml
 default_images:
   jupyterhub: "quansight/qhub-jupyterhub:v||QHUB_VERSION||"
   jupyterlab: "quansight/qhub-jupyterlab:v||QHUB_VERSION||"
   dask_worker: "quansight/qhub-dask-worker:v||QHUB_VERSION||"
-  dask_gateway: "quansight/qhub-dask-gateway:v||QHUB_VERSION||"
-  conda_store: "quansight/conda-store-server:v0.3.3"
 ```
 
 ## Storage
@@ -831,7 +829,6 @@ default_images:
   jupyterhub: "quansight/qhub-jupyterhub:v||QHUB_VERSION||"
   jupyterlab: "quansight/qhub-jupyterlab:v||QHUB_VERSION||"
   dask_worker: "quansight/qhub-dask-worker:v||QHUB_VERSION||"
-  conda_store: "quansight/conda-store-server:v0.3.3"
 
 theme:
   jupyterhub:

diff --git a/docs/source/installation/existing.md b/docs/source/installation/existing.md
@@ -128,8 +128,6 @@ default_images:
   jupyterhub: quansight/qhub-jupyterhub:v0.3.13
   jupyterlab: quansight/qhub-jupyterlab:v0.3.13
   dask_worker: quansight/qhub-dask-worker:v0.3.13
-  dask_gateway: quansight/qhub-dask-gateway:v0.3.13
-  conda_store: quansight/conda-store-server:v0.3.3
 storage:
   conda_store: 60Gi
   shared_filesystem: 100Gi

diff --git a/qhub/initialize.py b/qhub/initialize.py
@@ -37,7 +37,6 @@
         "jupyterhub": f"quansight/qhub-jupyterhub:{qhub_image_tag}",
         "jupyterlab": f"quansight/qhub-jupyterlab:{qhub_image_tag}",
         "dask_worker": f"quansight/qhub-dask-worker:{qhub_image_tag}",
-        "dask_gateway": f"quansight/qhub-dask-gateway:{qhub_image_tag}",
     },
     "storage": {"conda_store": "60Gi", "shared_filesystem": "100Gi"},
     "theme": {

diff --git a/qhub/schema.py b/qhub/schema.py
@@ -120,7 +120,6 @@ class DefaultImages(Base):
     jupyterhub: str
     jupyterlab: str
     dask_worker: str
-    dask_gateway: str
 
 
 # =========== Authentication ==============

diff --git a/qhub/stages/input_vars.py b/qhub/stages/input_vars.py
@@ -238,9 +238,6 @@ def stage_07_kubernetes_services(stage_outputs, config):
             .get("extraEnv", [])
         ),
         # dask-gateway
-        "dask-gateway-image": _split_docker_image_name(
-            config["default_images"]["dask_gateway"]
-        ),
         "dask-worker-image": _split_docker_image_name(
             config["default_images"]["dask_worker"]
         ),

diff --git a/qhub/template/image/Dockerfile.dask-gateway b/qhub/template/image/Dockerfile.dask-gateway
diff --git a/qhub/template/image/docker-bake.json b/qhub/template/image/docker-bake.json
@@ -7,23 +7,13 @@
   "group": {
     "default": {
       "targets": [
-        "dask-gateway",
         "dask-worker",
         "jupyterhub",
         "jupyterlab"
       ]
     }
   },
   "target": {
-    "dask-gateway": {
-      "context": "./",
-      "dockerfile": "Dockerfile.dask-gateway",
-      "tags": [
-        "docker.io/quansight/qhub-dask-gateway:${TAG}",
-        "ghcr.io/quansight/qhub-dask-gateway:${TAG}",
-        "quay.io/quansight/qhub-dask-gateway:${TAG}"
-      ]
-    },
     "dask-worker": {
       "context": "./",
       "dockerfile": "Dockerfile.dask-worker",

diff --git a/qhub/template/stages/07-kubernetes-services/dask_gateway.tf b/qhub/template/stages/07-kubernetes-services/dask_gateway.tf
@@ -7,14 +7,6 @@ variable "dask-worker-image" {
   })
 }
 
-variable "dask-gateway-image" {
-  description = "Dask worker image"
-  type = object({
-    name = string
-    tag  = string
-  })
-}
-
 variable "dask-gateway-profiles" {
   description = "Dask Gateway profiles to expose to user"
   default = []
@@ -32,8 +24,6 @@ module "dask-gateway" {
   external-url = var.endpoint
 
   cluster-image    = var.dask-worker-image
-  gateway-image    = var.dask-gateway-image
-  controller-image = var.dask-gateway-image
 
   general-node-group = var.node_groups.general
   worker-node-group  = var.node_groups.worker

diff --git a/...7-kubernetes-services/modules/kubernetes/services/dask-gateway/files/controller_config.py b/...7-kubernetes-services/modules/kubernetes/services/dask-gateway/files/controller_config.py
@@ -32,38 +32,3 @@ def dask_gateway_config(path="/var/lib/dask-gateway/config.json"):
 
 c.KubeController.proxy_web_entrypoint = "websecure"
 c.KubeController.proxy_tcp_entrypoint = "tcp"
-
-
-# override default make_ingressroute to add tls cert resolver
-def make_ingressroute(self, cluster_name, namespace):
-    route = f"{self.proxy_prefix}/clusters/{namespace}.{cluster_name}/"
-    return {
-        "apiVersion": "traefik.containo.us/v1alpha1",
-        "kind": "IngressRoute",
-        "metadata": {
-            "labels": self.get_labels(cluster_name, "dask-scheduler"),
-            "annotations": self.common_annotations,
-            "name": f"dask-{cluster_name}",
-        },
-        "spec": {
-            "entryPoints": [self.proxy_web_entrypoint],
-            "routes": [
-                {
-                    "kind": "Rule",
-                    "match": f"PathPrefix(`{route}`)",
-                    "services": [
-                        {
-                            "name": self.make_service_name(cluster_name),
-                            "namespace": namespace,
-                            "port": 8787,
-                        }
-                    ],
-                    "middlewares": self.proxy_web_middlewares,
-                }
-            ],
-            "tls": {},
-        },
-    }
-
-
-c.KubeController.make_ingressroute = make_ingressroute
diff --git a/qhub/upgrade.py b/qhub/upgrade.py
@@ -318,6 +318,10 @@ def _version_specific_upgrade(
         if "conda_store" in config["default_images"]:
             del config["default_images"]["conda_store"]
 
+        # Remove dask_gateway image from default_images
+        if "dask_gateway" in config["default_images"]:
+            del config["default_images"]["dask_gateway"]
+
         # Create root password
         default_password = "".join(
             secrets.choice(string.ascii_letters + string.digits) for i in range(16)