Merge branch 'main' into pin_versions

GoogleCloudPlatform · Mar 6, 2024 · bc5d8c0 · bc5d8c0
2 parents 41fde7e + 7093da3
commit bc5d8c0
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 7 deletions.
diff --git a/applications/rag/main.tf b/applications/rag/main.tf
@@ -181,6 +181,7 @@ module "kuberay-monitoring" {
   create_namespace                = true
   enable_grafana_on_ray_dashboard = var.enable_grafana_on_ray_dashboard
   k8s_service_account             = var.ray_service_account
+  depends_on                      = [module.namespace]
 }
 
 module "inference-server" {
@@ -218,5 +219,5 @@ module "frontend" {
   url_domain_addr          = var.frontend_url_domain_addr
   url_domain_name          = var.frontend_url_domain_name
   members_allowlist        = var.frontend_members_allowlist
-  depends_on = [ module.namespace ]
+  depends_on               = [ module.namespace ]
 }
diff --git a/infrastructure/main.tf b/infrastructure/main.tf
@@ -57,6 +57,7 @@ module "public-gke-standard-cluster" {
   cluster_name                         = var.cluster_name
   cluster_labels                       = var.cluster_labels
   kubernetes_version                   = var.kubernetes_version
+  release_channel                      = var.release_channel
   cluster_region                       = var.cluster_region
   cluster_zones                        = var.cluster_zones
   ip_range_pods                        = var.ip_range_pods
@@ -93,6 +94,7 @@ module "public-gke-autopilot-cluster" {
   cluster_name               = var.cluster_name
   cluster_labels             = var.cluster_labels
   kubernetes_version         = var.kubernetes_version
+  release_channel            = var.release_channel
   cluster_region             = var.cluster_region
   cluster_zones              = var.cluster_zones
   ip_range_pods              = var.ip_range_pods
@@ -117,6 +119,7 @@ module "private-gke-standard-cluster" {
   cluster_name                         = var.cluster_name
   cluster_labels                       = var.cluster_labels
   kubernetes_version                   = var.kubernetes_version
+  release_channel                      = var.release_channel
   cluster_region                       = var.cluster_region
   cluster_zones                        = var.cluster_zones
   ip_range_pods                        = var.ip_range_pods
@@ -154,6 +157,7 @@ module "private-gke-autopilot-cluster" {
   cluster_name               = var.cluster_name
   cluster_labels             = var.cluster_labels
   kubernetes_version         = var.kubernetes_version
+  release_channel            = var.release_channel
   cluster_region             = var.cluster_region
   cluster_zones              = var.cluster_zones
   ip_range_pods              = var.ip_range_pods

diff --git a/infrastructure/variables.tf b/infrastructure/variables.tf
@@ -98,6 +98,11 @@ variable "kubernetes_version" {
   default = "latest"
 }
 
+variable "release_channel" {
+  type    = string
+  default = "RAPID"
+}
+
 variable "cluster_region" {
   type = string
 }

diff --git a/modules/gke-autopilot-private-cluster/README.md b/modules/gke-autopilot-private-cluster/README.md
@@ -33,6 +33,7 @@
 | <a name="input_network_name"></a> [network\_name](#input\_network\_name) | # network variables | `string` | n/a | yes |
 | <a name="input_project_id"></a> [project\_id](#input\_project\_id) | GCP project id | `string` | n/a | yes |
 | <a name="input_region"></a> [region](#input\_region) | GCP project region or zone | `string` | `"us-central1"` | no |
+| <a name="input_release_channel"></a> [release\_channel](#input\_release\_channel) | n/a | `string` | n/a | yes |
 | <a name="input_subnetwork_name"></a> [subnetwork\_name](#input\_subnetwork\_name) | n/a | `string` | n/a | yes |
 
 ## Outputs

diff --git a/modules/gke-autopilot-private-cluster/main.tf b/modules/gke-autopilot-private-cluster/main.tf
@@ -25,6 +25,7 @@ module "gke" {
   name                    = var.cluster_name
   cluster_resource_labels = var.cluster_labels
   kubernetes_version      = var.kubernetes_version
+  release_channel         = var.release_channel
   region                  = var.cluster_region
   zones                   = var.cluster_zones
   network                 = var.network_name

diff --git a/modules/gke-autopilot-private-cluster/variables.tf b/modules/gke-autopilot-private-cluster/variables.tf
@@ -46,6 +46,10 @@ variable "kubernetes_version" {
   type = string
 }
 
+variable "release_channel" {
+  type = string
+}
+
 variable "cluster_regional" {
   type = bool
 }

diff --git a/modules/gke-autopilot-public-cluster/README.md b/modules/gke-autopilot-public-cluster/README.md
@@ -25,10 +25,11 @@ No resources.
 | <a name="input_network_name"></a> [network\_name](#input\_network\_name) | # network variables | `string` | n/a | yes |
 | <a name="input_project_id"></a> [project\_id](#input\_project\_id) | GCP project id | `string` | n/a | yes |
 | <a name="input_region"></a> [region](#input\_region) | GCP project region or zone | `string` | `"us-central1"` | no |
+| <a name="input_release_channel"></a> [release\_channel](#input\_release\_channel) | n/a | `string` | n/a | yes |
 | <a name="input_subnetwork_name"></a> [subnetwork\_name](#input\_subnetwork\_name) | n/a | `string` | n/a | yes |
 
 ## Outputs
 
 | Name | Description |
 |------|-------------|
-| <a name="output_cluster"></a> [cluster](#output\_cluster) | n/a |
+| <a name="output_cluster"></a> [cluster](#output\_cluster) | n/a |
diff --git a/modules/gke-autopilot-public-cluster/main.tf b/modules/gke-autopilot-public-cluster/main.tf
@@ -21,12 +21,12 @@ module "gke" {
   cluster_resource_labels    = var.cluster_labels
   region                     = var.cluster_region
   kubernetes_version         = var.kubernetes_version
+  release_channel            = var.release_channel
   zones                      = var.cluster_zones
   network                    = var.network_name
   subnetwork                 = var.subnetwork_name
   ip_range_pods              = var.ip_range_pods
   ip_range_services          = var.ip_range_services
   master_authorized_networks = var.master_authorized_networks
   deletion_protection        = var.deletion_protection
-
 }
diff --git a/modules/gke-autopilot-public-cluster/variables.tf b/modules/gke-autopilot-public-cluster/variables.tf
@@ -50,6 +50,10 @@ variable "kubernetes_version" {
   type = string
 }
 
+variable "release_channel" {
+  type = string
+}
+
 variable "cluster_region" {
   type = string
 }
@@ -74,4 +78,4 @@ variable "master_authorized_networks" {
 variable "deletion_protection" {
   type    = bool
   default = false
-}
+}
diff --git a/modules/gke-standard-private-cluster/README.md b/modules/gke-standard-private-cluster/README.md
@@ -43,11 +43,12 @@
 | <a name="input_network_name"></a> [network\_name](#input\_network\_name) | # network variables | `string` | n/a | yes |
 | <a name="input_project_id"></a> [project\_id](#input\_project\_id) | GCP project id | `string` | n/a | yes |
 | <a name="input_region"></a> [region](#input\_region) | GCP project region or zone | `string` | `"us-central1"` | no |
+| <a name="input_release_channel"></a> [release\_channel](#input\_release\_channel) | n/a | `string` | n/a | yes |
 | <a name="input_subnetwork_name"></a> [subnetwork\_name](#input\_subnetwork\_name) | n/a | `string` | n/a | yes |
 | <a name="input_tpu_pools"></a> [tpu\_pools](#input\_tpu\_pools) | n/a | `list(map(any))` | n/a | yes |
 
 ## Outputs
 
 | Name | Description |
 |------|-------------|
-| <a name="output_cluster"></a> [cluster](#output\_cluster) | n/a |
+| <a name="output_cluster"></a> [cluster](#output\_cluster) | n/a |
diff --git a/modules/gke-standard-private-cluster/main.tf b/modules/gke-standard-private-cluster/main.tf
@@ -29,6 +29,7 @@ module "gke" {
   name                                 = var.cluster_name
   cluster_resource_labels              = var.cluster_labels
   kubernetes_version                   = var.kubernetes_version
+  release_channel                      = var.release_channel
   region                               = var.cluster_region
   zones                                = var.cluster_zones
   network                              = var.network_name

diff --git a/modules/gke-standard-private-cluster/variables.tf b/modules/gke-standard-private-cluster/variables.tf
@@ -46,6 +46,10 @@ variable "kubernetes_version" {
   type = string
 }
 
+variable "release_channel" {
+  type = string
+}
+
 variable "cluster_regional" {
   type = bool
 }

diff --git a/modules/gke-standard-public-cluster/README.md b/modules/gke-standard-public-cluster/README.md
@@ -35,11 +35,12 @@ No resources.
 | <a name="input_network_name"></a> [network\_name](#input\_network\_name) | # network variables | `string` | n/a | yes |
 | <a name="input_project_id"></a> [project\_id](#input\_project\_id) | GCP project id | `string` | n/a | yes |
 | <a name="input_region"></a> [region](#input\_region) | GCP project region or zone | `string` | `"us-central1"` | no |
+| <a name="input_release_channel"></a> [release\_channel](#input\_release\_channel) | n/a | `string` | n/a | yes |
 | <a name="input_subnetwork_name"></a> [subnetwork\_name](#input\_subnetwork\_name) | n/a | `string` | n/a | yes |
 | <a name="input_tpu_pools"></a> [tpu\_pools](#input\_tpu\_pools) | n/a | `list(map(any))` | n/a | yes |
 
 ## Outputs
 
 | Name | Description |
 |------|-------------|
-| <a name="output_cluster"></a> [cluster](#output\_cluster) | n/a |
+| <a name="output_cluster"></a> [cluster](#output\_cluster) | n/a |
diff --git a/modules/gke-standard-public-cluster/main.tf b/modules/gke-standard-public-cluster/main.tf
@@ -25,6 +25,7 @@ module "gke" {
   cluster_resource_labels              = var.cluster_labels
   region                               = var.cluster_region
   kubernetes_version                   = var.kubernetes_version
+  release_channel                      = var.release_channel
   zones                                = var.cluster_zones
   network                              = var.network_name
   subnetwork                           = var.subnetwork_name

diff --git a/modules/gke-standard-public-cluster/variables.tf b/modules/gke-standard-public-cluster/variables.tf
@@ -50,6 +50,10 @@ variable "kubernetes_version" {
   type = string
 }
 
+variable "release_channel" {
+  type = string
+}
+
 variable "cluster_region" {
   type = string
 }
@@ -117,4 +121,4 @@ variable "gpu_pools" {
 
 variable "tpu_pools" {
   type = list(map(any))
-}
+}