Set the namespace in the sample configurations for the rag, ray, & jupyter applications to ai-on-gke (#633)

Robert Bailey · alpha-amundson · commit 8b363ab68e50 · 2024-05-03T12:27:54.000-07:00
Set the namespace in the sample configurations for the rag, ray, &amp; jupyter
applications to `ai-on-gke`.
diff --git a/applications/jupyter/workloads-auto-create-brand.example.tfvars b/applications/jupyter/workloads-auto-create-brand.example.tfvars
@@ -27,7 +27,7 @@ cluster_membership_id = "" # required only for private cluster, default: cluster
 #######################################################
 
 ## JupyterHub variables
-kubernetes_namespace              = "jupyter"
+kubernetes_namespace              = "ai-on-gke"
 create_gcs_bucket                 = true
 gcs_bucket                        = "<gcs-bucket>"
 workload_identity_service_account = "jupyter-service-account"
diff --git a/applications/jupyter/workloads-existing-brand-auto-create-client.example.tfvars b/applications/jupyter/workloads-existing-brand-auto-create-client.example.tfvars
@@ -27,7 +27,7 @@ cluster_membership_id = "" # required only for private cluster, default: cluster
 #######################################################
 
 ## JupyterHub variables
-kubernetes_namespace              = "jupyter"
+kubernetes_namespace              = "ai-on-gke"
 gcs_bucket                        = "<gcs-bucket>"
 workload_identity_service_account = "jupyter-service-account"
 
diff --git a/applications/jupyter/workloads-existing-brand-existing-client.example.tfvars b/applications/jupyter/workloads-existing-brand-existing-client.example.tfvars
@@ -27,7 +27,7 @@ cluster_membership_id = "" # required only for private cluster, default: cluster
 #######################################################
 
 ## JupyterHub variables
-kubernetes_namespace              = "jupyter"
+kubernetes_namespace              = "ai-on-gke"
 create_gcs_bucket                 = true
 gcs_bucket                        = "<gcs-bucket>"
 workload_identity_service_account = "jupyter-service-account"
@@ -45,4 +45,4 @@ k8s_backend_service_port = 80
 domain            = "jupyter.example.com"
 client_id         = "<client_id>"
 client_secret     = "<client_secret>"
-members_allowlist = "user:<email>,group:<email>,serviceAccount:<email>,domain:google.com"
+members_allowlist = "user:<email>,group:<email>,serviceAccount:<email>,domain:google.com"
diff --git a/applications/jupyter/workloads-without-iap.example.tfvars b/applications/jupyter/workloads-without-iap.example.tfvars
@@ -27,7 +27,7 @@ cluster_membership_id = "" # required only for private clusters, default: cluste
 #######################################################
 
 ## JupyterHub variables
-kubernetes_namespace              = "jupyter"
+kubernetes_namespace              = "ai-on-gke"
 gcs_bucket                        = "<gcs-bucket>"
 create_gcs_bucket                 = true
 workload_identity_service_account = "jupyter-service-account"
diff --git a/applications/jupyter/workloads.tfvars b/applications/jupyter/workloads.tfvars
@@ -32,7 +32,7 @@ cluster_membership_id = "" # required for private cluster, defaults to `cluster_
 #######################################################
 
 ## JupyterHub variables
-kubernetes_namespace              = "ml"
+kubernetes_namespace              = "ai-on-gke"
 create_gcs_bucket                 = true
 gcs_bucket                        = "gcs-bucket-<unique-suffix>" # Choose a globally unique bucket name.
 workload_identity_service_account = "jupyter-sa"
diff --git a/applications/rag/metadata.yaml b/applications/rag/metadata.yaml
@@ -187,7 +187,7 @@ spec:
       - name: kubernetes_namespace
         description: Kubernetes namespace where resources are deployed
         varType: string
-        defaultValue: rag
+        defaultValue: ai-on-gke
       - name: network_name
         description: Network name of VPC
         varType: string
diff --git a/applications/rag/variables.tf b/applications/rag/variables.tf
@@ -39,7 +39,7 @@ variable "kubernetes_version" {
 variable "kubernetes_namespace" {
   type        = string
   description = "Kubernetes namespace where resources are deployed"
-  default     = "rag"
+  default     = "ai-on-gke"
 }
 
 variable "additional_labels" {
diff --git a/applications/rag/workloads.tfvars b/applications/rag/workloads.tfvars
@@ -24,7 +24,7 @@ autopilot_cluster = false
 private_cluster   = false
 
 ## GKE environment variables
-kubernetes_namespace = "rag"
+kubernetes_namespace = "ai-on-gke"
 
 # The bucket name must be globally unique (across all of Google Cloud).
 # To verify, check that `gcloud storage buckets describe gs://<bucketname>` returns a 404.
@@ -69,4 +69,4 @@ frontend_members_allowlist = "user:<email>,group:<email>,serviceAccount:<email>,
 ## Ray Dashboard IAP Settings
 ray_dashboard_add_auth          = false                                                                 # Set to true to enable authenticated access via IAP.
 ray_dashboard_domain            = "ray.example.com"                                                     # Custom domain for ingress resource and ssl certificate. 
-ray_dashboard_members_allowlist = "user:<email>,group:<email>,serviceAccount:<email>,domain:google.com" # Allowlist principals for access.
+ray_dashboard_members_allowlist = "user:<email>,group:<email>,serviceAccount:<email>,domain:google.com" # Allowlist principals for access.
diff --git a/applications/ray/tfvars_examples/raycluster-with-gcsfuse-volumes.tfvars b/applications/ray/tfvars_examples/raycluster-with-gcsfuse-volumes.tfvars
@@ -27,7 +27,7 @@ cluster_location = "us-central1"
 #######################################################
 
 ## GKE environment variables
-kubernetes_namespace = "ray"
+kubernetes_namespace = "ai-on-gke"
 
 # Creates a google service account & k8s service account & configures workload identity with appropriate permissions.
 # Set to false & update the variable `workload_identity_service_account` to use an existing IAM service account.
diff --git a/applications/ray/tfvars_examples/raycluster-with-grafana-dashboard.tfvars b/applications/ray/tfvars_examples/raycluster-with-grafana-dashboard.tfvars
@@ -27,7 +27,7 @@ cluster_location = "us-central1"
 #######################################################
 
 ## GKE environment variables
-kubernetes_namespace = "ray"
+kubernetes_namespace = "ai-on-gke"
 
 # Creates a google service account & k8s service account & configures workload identity with appropriate permissions.
 # Set to false & update the variable `workload_identity_service_account` to use an existing IAM service account.
diff --git a/applications/ray/tfvars_examples/raycluster-with-iap-auth.tfvars b/applications/ray/tfvars_examples/raycluster-with-iap-auth.tfvars
@@ -27,7 +27,7 @@ cluster_location = "us-central1"
 #######################################################
 
 ## GKE environment variables
-kubernetes_namespace = "ray"
+kubernetes_namespace = "ai-on-gke"
 
 # Creates a google service account & k8s service account & configures workload identity with appropriate permissions.
 # Set to false & update the variable `workload_identity_service_account` to use an existing IAM service account.
diff --git a/applications/ray/tfvars_examples/raycluster-with-workload-identity.tfvars b/applications/ray/tfvars_examples/raycluster-with-workload-identity.tfvars
@@ -27,7 +27,7 @@ cluster_location = "us-east4"
 #######################################################
 
 ## GKE environment variables
-kubernetes_namespace = "ray-kuberay11"
+kubernetes_namespace = "ai-on-gke"
 
 # Creates a google service account & k8s service account & configures workload identity with appropriate permissions.
 # Set to false & update the variable `workload_identity_service_account` to use an existing IAM service account.
diff --git a/applications/ray/tfvars_examples/simple-raycluster-with-existing-gke-cluster.tfvars b/applications/ray/tfvars_examples/simple-raycluster-with-existing-gke-cluster.tfvars
@@ -27,7 +27,7 @@ cluster_location = "<your-cluster-location>"
 #######################################################
 
 ## GKE environment variables
-kubernetes_namespace = "ray"
+kubernetes_namespace = "ai-on-gke"
 
 # Creates a google service account & k8s service account & configures workload identity with appropriate permissions.
 # Set to false & update the variable `workload_identity_service_account` to use an existing IAM service account.
diff --git a/applications/ray/tfvars_examples/simple-raycluster-with-new-gke-cluster.tfvars b/applications/ray/tfvars_examples/simple-raycluster-with-new-gke-cluster.tfvars
@@ -27,7 +27,7 @@ cluster_location = "<your-cluster-location>"
 #######################################################
 
 ## GKE environment variables
-kubernetes_namespace = "ray"
+kubernetes_namespace = "ai-on-gke"
 
 # Creates a google service account & k8s service account & configures workload identity with appropriate permissions.
 # Set to false & update the variable `workload_identity_service_account` to use an existing IAM service account.
diff --git a/applications/ray/variables.tf b/applications/ray/variables.tf
@@ -39,7 +39,7 @@ variable "ray_version" {
 variable "kubernetes_namespace" {
   type        = string
   description = "Kubernetes namespace where resources are deployed"
-  default     = "ml"
+  default     = "ai-on-gke"
 }
 
 variable "enable_grafana_on_ray_dashboard" {
diff --git a/applications/ray/workloads.tfvars b/applications/ray/workloads.tfvars
@@ -32,7 +32,7 @@ autopilot_cluster = true
 #######################################################
 
 ## GKE environment variables
-kubernetes_namespace = "ml"
+kubernetes_namespace = "ai-on-gke"
 
 # Creates a google service account & k8s service account & configures workload identity with appropriate permissions.
 # Set to false & update the variable `workload_identity_service_account` to use an existing IAM service account.

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ variable "kubernetes_version" {`
`39`	`39`	`variable "kubernetes_namespace" {`
`40`	`40`	`type = string`
`41`	`41`	`description = "Kubernetes namespace where resources are deployed"`
`42`		`- default = "rag"`
	`42`	`+ default = "ai-on-gke"`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`variable "additional_labels" {`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ variable "ray_version" {`
`39`	`39`	`variable "kubernetes_namespace" {`
`40`	`40`	`type = string`
`41`	`41`	`description = "Kubernetes namespace where resources are deployed"`
`42`		`- default = "ml"`
	`42`	`+ default = "ai-on-gke"`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`variable "enable_grafana_on_ray_dashboard" {`