[notebook] Remove the notebook and workshop service

Makefile

@@ -2,7 +2,7 @@
 
 include config.mk
 
-SERVICES := auth batch ci notebook monitoring website
+SERVICES := auth batch ci monitoring website
 SERVICES_PLUS_ADMIN_POD := $(SERVICES) admin-pod
 SERVICES_IMAGES := $(patsubst %, %-image, $(SERVICES_PLUS_ADMIN_POD))
 SERVICES_MODULES := $(SERVICES) gear web_common

build.yaml

@@ -944,68 +944,6 @@ steps:
       - create_test_gsa_keys
       - build_hail_debug_jar_and_wheel
       - build_hail_test_artifacts
-  - kind: buildImage2
-    name: notebook_image
-    dockerFile: /io/repo/notebook/Dockerfile
-    contextPath: /io/repo/
-    publishAs: notebook
-    inputs:
-      - from: /repo/notebook
-        to: /io/repo/notebook
-      - from: /repo/hail/python/setup-hailtop.py
-        to: /io/repo/hail/python/setup-hailtop.py
-      - from: /repo/hail/python/MANIFEST.in
-        to: /io/repo/hail/python/MANIFEST.in
-      - from: /repo/hail/python/hailtop
-        to: /io/repo/hail/python/hailtop
-      - from: /hail_version
-        to: /io/repo/hail/python/hailtop/hail_version
-      - from: /repo/gear
-        to: /io/repo/gear
-      - from: /repo/web_common
-        to: /io/repo/web_common
-    dependsOn:
-      - hail_ubuntu_image
-      - merge_code
-  - kind: runImage
-    name: render_notebook_nginx_conf
-    image:
-      valueFrom: ci_utils_image.image
-    script: |
-      set -ex
-      cd /io/repo/notebook
-      {% if deploy %}
-      DEPLOY=true
-      {% else %}
-      DEPLOY=false
-      {% endif %}
-      python3 ../ci/jinja2_render.py '{"deploy": '${DEPLOY}', "default_ns": {"name": "{{ default_ns.name }}"}}' nginx.conf nginx.conf.out
-    inputs:
-      - from: /repo/ci/jinja2_render.py
-        to: /io/repo/ci/jinja2_render.py
-      - from: /repo/notebook
-        to: /io/repo/notebook
-    outputs:
-      - from: /io/repo/notebook/nginx.conf.out
-        to: /notebook/nginx.conf.out
-    dependsOn:
-      - default_ns
-      - ci_utils_image
-      - merge_code
-  - kind: buildImage2
-    name: notebook_nginx_image
-    dockerFile: /io/notebook/Dockerfile.nginx
-    contextPath: /io/notebook
-    publishAs: notebook_nginx
-    inputs:
-      - from: /repo/notebook
-        to: /io/notebook
-      - from: /notebook/nginx.conf.out
-        to: /io/notebook/nginx.conf.out
-    dependsOn:
-      - hail_ubuntu_image
-      - render_notebook_nginx_conf
-      - merge_code
   - kind: runImage
     name: test_hail_python
     numSplits: 28
@@ -3040,47 +2978,6 @@ steps:
     inputs:
       - from: /repo/hail/python/hailtop
         to: /io/hailtop
-  - kind: createDatabase2
-    name: notebook_database
-    databaseName: notebook
-    image:
-      valueFrom: ci_utils_image.image
-    migrations:
-      - name: initial
-        script: /io/sql/initial.sql
-    inputs:
-      - from: /repo/notebook/sql
-        to: /io/sql
-    namespace:
-      valueFrom: default_ns.name
-    shutdowns:
-      - kind: Deployment
-        namespace:
-          valueFrom: default_ns.name
-        name: notebook
-    dependsOn:
-      - default_ns
-      - merge_code
-      - ci_utils_image
-      - create_test_database_server_config
-      - deploy_test_db
-  - kind: deploy
-    name: deploy_notebook
-    namespace:
-      valueFrom: default_ns.name
-    config: notebook/deployment.yaml
-    dependsOn:
-      - default_ns
-      - create_session_key
-      - notebook_image
-      - notebook_nginx_image
-      - deploy_auth
-      - notebook_database
-      - create_certs
-    wait:
-      - kind: Service
-        name: notebook
-        for: alive
   - kind: runImage
     name: cleanup_ci_test_repo
     resources:

dev-docs/hail-overview.md

@@ -100,7 +100,6 @@ Services (see below for descriptions):
 * $HAIL/ci
 * $HAIL/gateway
 * $HAIL/internal-gateway
-* $HAIL/notebook: notebook and workshop services
 * $HAIL/site
 
 Libraries for services:
@@ -195,7 +194,7 @@ Some services rely on 3rd party services.  Those include:
 
 * ci depends on GitHub
 
-* batch, ci and notebook depend on K8s
+* batch, ci and auth depend on K8s
 
 * batch depends on K8s and GCP
 
@@ -246,12 +245,6 @@ There is a collection of libraries to facilitate service development:
   connections from the Google Virtual Private Cloud (VPC) network and
   connections to the services in K8s.
 
-* notebook: The notebook service is a simple Jupyter notebook service
-  similar to Google Colab.  It is available both at
-  https://notebook.hail.is/ and https://workshop.hail.is/.  workshop
-  is used for running Hail workshops and tutorials.  The notebook
-  service is not currently used.
-
 * site: site implements the main Hail website https://hail.is/
   including the landing page and Hail Query and Hail Batch
   documentation.

hail/python/hailtop/batch/docs/service.rst

@@ -29,8 +29,8 @@ that allows a user to see job progress and access logs.
 Sign Up
 -------
 
-For Broad Institute users, you can click the Sign Up button at `<https://notebook.hail.is>`__.
-This will allow you to authorize with your Broad Institute email address and create
+For Broad Institute users, you can sign up at `<https://auth.hail.is/signup>`__.
+This will allow you to authenticate with your Broad Institute email address and create
 a Batch Service account. A :ref:`Google Service Account <service-accounts>` is created
 on your behalf. A trial Batch billing project is also created for you at
 :code:`<USERNAME>-trial`. You can view these at `<https://auth.hail.is/user>`__.

infra/gcp-broad/gcp-ar-cleanup-policy.txt

@@ -124,8 +124,6 @@
                 "linting",
                 "monitoring",
                 "netcat",
-                "notebook",
-                "notebook_nginx",
                 "query-build",
                 "test-ci-utils",
                 "test_hello_create_certs_image",

letsencrypt/subdomains.txt

@@ -1,5 +1,4 @@
 ci
-notebook
 www
 batch
 batch-driver
@@ -8,7 +7,6 @@ memory
 monitoring
 auth
 ukbb-rg
-workshop
 grafana
 prometheus
 hello