update infra to support gpu location

GoogleCloudPlatform · Mar 5, 2024 · 33b6021 · 33b6021
1 parent 6593f00
commit 33b6021
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/modules/jupyter/jupyter_config/config-selfauth-autopilot.yaml b/modules/jupyter/jupyter_config/config-selfauth-autopilot.yaml
@@ -34,8 +34,6 @@ hub:
       namespace: '${namespace}'
       service_name: '${service_name}'
       project_number: '${project_number}'
-      # support legacy image
-      expected_audience: '/projects/${project_number}/global/backendServices/${service_id}'
     Authenticator:
       admin_users:
         - admin

diff --git a/modules/jupyter/main.tf b/modules/jupyter/main.tf
@@ -162,12 +162,9 @@ resource "helm_release" "jupyterhub" {
       ephemeral_storage   = var.ephemeral_storage
     })
     ] : [templatefile("${path.module}/jupyter_config/config-selfauth.yaml", {
-      password       = var.add_auth ? "dummy" : random_password.generated_password[0].result
-      project_id     = var.project_id
-      project_number = data.google_project.project.number
-
-      # Support legacy image.
-      service_id          = "" # TODO(umeshkumhar): var.add_auth ? (data.google_compute_backend_service.jupyter-ingress[0].generated_id != null ? data.google_compute_backend_service.jupyter-ingress[0].generated_id : "no-id-yet") : "no-id-yet"
+      password            = var.add_auth ? "dummy" : random_password.generated_password[0].result
+      project_id          = var.project_id
+      project_number      = data.google_project.project.number
       namespace           = var.namespace
       backend_config      = var.k8s_backend_config_name
       service_name        = var.k8s_backend_service_name