fix: remove gke cluster version

Change-Id: I7991fa3ae75e88fe88436e612c2e09297c02d360
GoogleCloudPlatform · Sep 16, 2024 · 0f52def · 0f52def
1 parent 9ff340f
commit 0f52def
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/applications/rag/main.tf b/applications/rag/main.tf
@@ -79,10 +79,7 @@ module "infra" {
   enable_gpu        = true
   gpu_pools         = var.gpu_pools
   ray_addon_enabled = true
-  # TODO(genlu): remove channel and k8s_version after ray addon is in REGULAR channel
-  release_channel    = "RAPID"
-  kubernetes_version = "1.30.3-gke.1969000"
-  depends_on         = [module.project-services]
+  depends_on        = [module.project-services]
 }
 
 data "google_container_cluster" "default" {

diff --git a/applications/ray/main.tf b/applications/ray/main.tf
@@ -74,10 +74,7 @@ module "infra" {
   enable_gpu        = var.enable_gpu
   gpu_pools         = var.gpu_pools
   ray_addon_enabled = true
-  # TODO(genlu): remove channel and k8s_version after ray addon is in REGULAR channel
-  release_channel    = "RAPID"
-  kubernetes_version = "1.30.3-gke.1969000"
-  depends_on         = [module.project-services]
+  depends_on        = [module.project-services]
 }
 
 data "google_container_cluster" "default" {

diff --git a/infrastructure/tfvars_tests/standard-gke-public.platform.tfvars b/infrastructure/tfvars_tests/standard-gke-public.platform.tfvars
@@ -37,9 +37,6 @@ cluster_name        = "test-cluster"
 cluster_location    = "us-east4"
 gcs_fuse_csi_driver = true
 ray_addon_enabled   = true
-# TODO(genlu): remove release_channel and kubernetes_version after 1.30.3-gke.1969000 is in REGULAR channel
-release_channel    = "RAPID"
-kubernetes_version = "1.30.3-gke.1969000"
 
 cpu_pools = [{
   name         = "cpu-pool"

diff --git a/infrastructure/versions.tf b/infrastructure/versions.tf
@@ -20,7 +20,7 @@ terraform {
     google-beta = {
       source = "hashicorp/google-beta"
       # Creating Autopilot using GKE submodule is broken in v6.2.0.
-      version = ">= 5.40.0, !=6.2.0"
+      version = ">= 5.40.0, <= 6.1.0"
     }
     helm = {
       source  = "hashicorp/helm"