Misc updates

2i2c-org · Jul 28, 2021 · 75563e9 · 75563e9
1 parent bb47f27
commit 75563e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/config/hubs/jmte.cluster.yaml b/config/hubs/jmte.cluster.yaml
@@ -152,6 +152,9 @@ hubs:
                 contactEmail: [email protected]
 
             service:
+              # Revert an unwanted basehub default
+              type: LoadBalancer
+
               # jupyterhub-ssh/sftp integration part 1/3:
               #
               # We must accept traffic to the k8s Service (proxy-public) receiving traffic

diff --git a/hub-templates/daskhub/values.yaml b/hub-templates/daskhub/values.yaml
@@ -75,11 +75,7 @@ basehub:
         # - Exploration issue: https://github.com/2i2c-org/pilot-hubs/issues/442
         #
         DASK_GATEWAY__CLUSTER__OPTIONS__IMAGE: '{JUPYTER_IMAGE_SPEC}'
-        # Try make this show up before SCRATCH_BUCKET but after JUPYTERHUB_USER
-        # by naming its entry.
-        SCRATCH_A:
-          name: DASK_GATEWAY__CLUSTER__OPTIONS__ENVIRONMENT
-          value: '{"SCRATCH_BUCKET": "$(SCRATCH_BUCKET)"}'
+        DASK_GATEWAY__CLUSTER__OPTIONS__ENVIRONMENT: '{"SCRATCH_BUCKET": "$(SCRATCH_BUCKET)"}'
         DASK_DISTRIBUTED__DASHBOARD_LINK: '/user/{JUPYTERHUB_USER}/proxy/{port}/status'
         DASK_LABEXTENSION__FACTORY__MODULE: 'dask_gateway'
         DASK_LABEXTENSION__FACTORY__CLASS: 'GatewayCluster'