fix e2e tests

modules/jupyter/main.tf

@@ -56,16 +56,23 @@ module "iap_auth" {
   count  = var.add_auth ? 1 : 0
   source = "../../modules/iap"
 
-  project_id                = var.project_id
-  namespace                 = var.namespace
-  k8s_ingress_name          = var.k8s_ingress_name
-  k8s_backend_config_name   = var.k8s_backend_config_name
-  k8s_backend_service_name  = var.k8s_backend_service_name
-  client_id                 = var.client_id != "" ? var.client_id : google_iap_client.iap_oauth_client[0].client_id
-  client_secret             = var.client_id != "" ? var.client_secret : google_iap_client.iap_oauth_client[0].secret
-  url_domain_addr           = var.url_domain_addr
-  url_domain_name           = var.url_domain_name
-  depends_on                = [google_project_service.project_service]
+  project_id                        = var.project_id
+  namespace                         = var.namespace
+  jupyter_add_auth                  = var.add_auth
+  jupyter_k8s_ingress_name          = var.k8s_ingress_name
+  jupyter_k8s_managed_cert_name     = var.k8s_managed_cert_name
+  jupyter_k8s_iap_secret_name       = var.k8s_iap_secret_name
+  jupyter_k8s_backend_config_name   = var.k8s_backend_config_name
+  jupyter_k8s_backend_service_name  = var.k8s_backend_service_name
+  jupyter_k8s_backend_service_port  = var.k8s_backend_service_port
+  jupyter_client_id                 = var.client_id != "" ? var.client_id : google_iap_client.iap_oauth_client[0].client_id
+  jupyter_client_secret             = var.client_id != "" ? var.client_secret : google_iap_client.iap_oauth_client[0].secret
+  jupyter_url_domain_addr           = var.url_domain_addr
+  jupyter_url_domain_name           = var.url_domain_name
+  depends_on                = [
+    google_project_service.project_service,
+    helm_release.jupyterhub
+  ]
 }
 
 module "jupyterhub-workload-identity" {
@@ -145,9 +152,6 @@ resource "helm_release" "jupyterhub" {
       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"
       namespace           = var.namespace
       backend_config      = var.k8s_backend_config_name
       service_name        = var.k8s_backend_service_name

modules/kuberay-monitoring/main.tf

@@ -52,4 +52,4 @@ data "kubernetes_service" "example" {
     namespace = var.namespace
   }
   depends_on = [helm_release.grafana]
-}
+}