From 6114d02109e43d2b861b3959fa0118b46799e340 Mon Sep 17 00:00:00 2001
From: genlu2011 <genlu2011@gmail.com>
Date: Mon, 16 Sep 2024 15:42:18 -0700
Subject: [PATCH] fix: remove gke cluster version (#817)

Change-Id: I7991fa3ae75e88fe88436e612c2e09297c02d360

Co-authored-by: Gen Lu <genlu@google.com>
---
 applications/rag/main.tf                                     | 5 +----
 applications/ray/main.tf                                     | 5 +----
 .../tfvars_tests/standard-gke-public.platform.tfvars         | 3 ---
 infrastructure/versions.tf                                   | 2 +-
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/applications/rag/main.tf b/applications/rag/main.tf
index 90c3c44e5..575de4f71 100644
--- 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
index 585490caf..82ee41514 100644
--- 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
index 999e5b44c..0d92ab7bd 100644
--- 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
index e4e2c02b4..8a019c2c6 100644
--- 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"