Set scratch bucket env vars only if needed

hub-templates/basehub/templates/cloud-resources/gcp/service-account.yaml

@@ -37,11 +37,4 @@ spec:
     apiVersion: resourcemanager.cnrm.cloud.google.com/v1beta1
     kind: Project
     external: projects/{{ .Values.jupyterhub.cloudResources.gcp.projectId }}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  annotations:
-    iam.gke.io/gcp-service-account: {{ include "cloudResources.gcp.serviceAccountName" .}}@{{ .Values.jupyterhub.cloudResources.gcp.projectId }}.iam.gserviceaccount.com
-  name: user-sa
 {{- end }}

hub-templates/basehub/templates/user-sa.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  annotations:
+    {{ if .Values.jupyterhub.cloudResources.scratchBucket.enabled}}
+    {{ if eq .Values.jupyterhub.cloudResources.provider "gcp" }}
+    iam.gke.io/gcp-service-account: {{ include "cloudResources.gcp.serviceAccountName" .}}@{{ .Values.jupyterhub.cloudResources.gcp.projectId }}.iam.gserviceaccount.com
+    {{- end }}
+    {{- end }}
+  name: user-sa

hub-templates/daskhub/values.yaml

@@ -52,30 +52,6 @@ basehub:
         # The default worker image matches the singleuser image.
         DASK_GATEWAY__CLUSTER__OPTIONS__IMAGE: '{JUPYTER_IMAGE_SPEC}'
 
-        # FIXME: Only set these if scratchBucket.enabled is true
-        # Explicitly order environment variables that depend on each
-        # other, since a environment variable needs to be defined first
-        # before they can be interpolated.
-        # See https://github.com/jupyterhub/kubespawner/issues/491
-        daskhub-01-scratch-bucket-protocol:
-          name: SCRATCH_BUCKET_PROTOCOL
-          valueFrom:
-            configMapKeyRef:
-              name: cloud-env-vars
-              key: scratch-bucket-protocol
-        daskhub-02-scratch-bucket-name:
-          name: SCRATCH_BUCKET_NAME
-          valueFrom:
-            configMapKeyRef:
-              name: cloud-env-vars
-              key: scratch-bucket-name
-        daskhub-03-scratch-bucket:
-          name: SCRATCH_BUCKET
-          value: $(SCRATCH_BUCKET_PROTOCOL)://$(SCRATCH_BUCKET_NAME)/$(JUPYTERHUB_USER)
-        daskhub-04-pangeo-scratch:
-          name: PANGEO_SCRATCH
-          value: $(SCRATCH_BUCKET)
-
     hub:
       networkPolicy:
         enabled: false
@@ -116,6 +92,29 @@ basehub:
                   break
           else:
               print("dask-gateway service not found. Did you set jupyterhub.hub.services.dask-gateway.apiToken?")
+        daskhub-02-cloud-storage-bucket: |
+          from z2jh import get_config
+          cloud_resources = get_config('cloudResources')
+          scratch_bucket = cloud_resources['scratchBucket']
+          import os
+
+          if scratch_bucket['enabled']:
+            # FIXME: Support other providers too
+            assert cloud_resources['provider'] == 'gcp'
+            project_id = cloud_resources['gcp']['projectId']
+
+            release = os.environ['HELM_RELEASE_NAME']
+            bucket_protocol = 'gcs'
+            bucket_name = f'{project_id}-{release}-scratch-bucket'
+            env = {
+              'SCRATCH_BUCKET_PROTOCOL': bucket_protocol,
+              # Matches "daskhub.scratchBUcket.name" helm template
+              'SCRATCH_BUCKET_NAME': bucket_name,
+              'SCRATCH_BUCKET': f'{bucket_protocol}://{bucket_name}',
+              'PANGEO_SCRATCH': f'{bucket_protocol}://{bucket_name}',
+            }
+
+            c.KubeSpawner.environment.update(env)
 
 dask-gateway:
   enabled: true  # Enabling dask-gateway will install Dask Gateway as a dependency.