CI fixes & revert jupterhub module changes

GoogleCloudPlatform · Mar 4, 2024 · 28636f0 · 28636f0
1 parent 9bce5f9
commit 28636f0
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 29 deletions.
diff --git a/applications/jupyter/variables.tf b/applications/jupyter/variables.tf
@@ -112,7 +112,6 @@ variable "url_domain_name" {
 variable "support_email" {
   type        = string
   description = "Email for users to contact with questions about their consent"
-  default     = ""
 }
 
 variable "client_id" {

diff --git a/applications/rag/tests/ray_job.py b/applications/rag/tests/ray_job.py
diff --git a/applications/rag/variables.tf b/applications/rag/variables.tf
@@ -209,7 +209,7 @@ variable "jupyter_k8s_backend_service_name" {
 
 variable "jupyter_k8s_backend_service_port" {
   type        = number
-  description = "NName of the Backend Service Port"
+  description = "Name of the Backend Service Port"
   default     = 80
 }
 

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -240,7 +240,6 @@ steps:
         echo "pass" > /workspace/rag_frontend_result.txt
 
     allowFailure: true
-    # waitFor: ['cleanup jupyterhub']
 
   - id: 'cleanup rag'
     name: 'gcr.io/$PROJECT_ID/terraform'

diff --git a/modules/iap/variables.tf b/modules/iap/variables.tf
@@ -137,7 +137,7 @@ variable "jupyter_k8s_backend_service_name" {
 
 variable "jupyter_k8s_backend_service_port" {
   type        = number
-  description = "NName of the Backend Service Port"
+  description = "Name of the Backend Service Port"
   default = 80
 }
 

diff --git a/modules/jupyter/main.tf b/modules/jupyter/main.tf
@@ -182,7 +182,6 @@ resource "helm_release" "jupyterhub" {
 }
 
 data "kubernetes_service" "jupyter-ingress" {
-  count       = var.add_auth ? 1 : 0
   metadata {
     name      = var.k8s_ingress_name
     namespace = var.namespace

diff --git a/modules/jupyter/outputs.tf b/modules/jupyter/outputs.tf
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 output "jupyterhub_uri" {
-  value = var.add_auth ? module.iap_auth[0].jupyter_domain : (data.kubernetes_service.jupyter-ingress[0].status != null ? (data.kubernetes_service.jupyter-ingress[0].status[0].load_balancer != null ? "${data.kubernetes_service.jupyter-ingress[0].status[0].load_balancer[0].ingress[0].ip}" : "") : "")
+  value = var.add_auth ? module.iap_auth[0].jupyter_domain : (data.kubernetes_service.jupyter-ingress.status != null ? (data.kubernetes_service.jupyter-ingress.status[0].load_balancer != null ? "${data.kubernetes_service.jupyter-ingress.status[0].load_balancer[0].ingress[0].ip}" : "") : "")
 }
 
 output "jupyterhub_password" {