From 9a23848e3864c60577363ba4649246ea6ab05a5a Mon Sep 17 00:00:00 2001
From: Gen Lu <genlu@google.com>
Date: Wed, 11 Sep 2024 17:25:08 +0000
Subject: [PATCH] fix: upgrade gke module to avoid TPGv5.44.0 with Autopilot

Change-Id: I716787e0dd8699b36d919feb5c42de6d6ccdbcb5
---
 infrastructure/versions.tf                    | 1 +
 modules/gke-autopilot-private-cluster/main.tf | 2 +-
 modules/gke-autopilot-public-cluster/main.tf  | 2 +-
 modules/gke-standard-private-cluster/main.tf  | 2 +-
 modules/gke-standard-public-cluster/main.tf   | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/infrastructure/versions.tf b/infrastructure/versions.tf
index b8e6f2c71..14eed5d24 100644
--- a/infrastructure/versions.tf
+++ b/infrastructure/versions.tf
@@ -19,6 +19,7 @@ terraform {
     }
     google-beta = {
       source = "hashicorp/google-beta"
+      version = ">= 5.40.0, != 5.44.0, !=6.2.0"
     }
     helm = {
       source  = "hashicorp/helm"
diff --git a/modules/gke-autopilot-private-cluster/main.tf b/modules/gke-autopilot-private-cluster/main.tf
index b7ceb277a..ab5364f4e 100644
--- a/modules/gke-autopilot-private-cluster/main.tf
+++ b/modules/gke-autopilot-private-cluster/main.tf
@@ -14,7 +14,7 @@
 
 module "gke" {
   source                  = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-private-cluster"
-  version                 = "32.0.1"
+  version                 = "33.0.0"
   project_id              = var.project_id
   regional                = var.cluster_regional
   name                    = var.cluster_name
diff --git a/modules/gke-autopilot-public-cluster/main.tf b/modules/gke-autopilot-public-cluster/main.tf
index 6f52c3ff7..ac9e0ce5a 100644
--- a/modules/gke-autopilot-public-cluster/main.tf
+++ b/modules/gke-autopilot-public-cluster/main.tf
@@ -14,7 +14,7 @@
 
 module "gke" {
   source                     = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-public-cluster"
-  version                    = "32.0.1"
+  version                    = "33.0.0"
   project_id                 = var.project_id
   regional                   = var.cluster_regional
   name                       = var.cluster_name
diff --git a/modules/gke-standard-private-cluster/main.tf b/modules/gke-standard-private-cluster/main.tf
index dbb58fe70..47ebd46c5 100644
--- a/modules/gke-standard-private-cluster/main.tf
+++ b/modules/gke-standard-private-cluster/main.tf
@@ -18,7 +18,7 @@ locals {
 
 module "gke" {
   source                               = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
-  version                              = "32.0.1"
+  version                              = "33.0.0"
   project_id                           = var.project_id
   regional                             = var.cluster_regional
   name                                 = var.cluster_name
diff --git a/modules/gke-standard-public-cluster/main.tf b/modules/gke-standard-public-cluster/main.tf
index 677d65f49..47eed0905 100644
--- a/modules/gke-standard-public-cluster/main.tf
+++ b/modules/gke-standard-public-cluster/main.tf
@@ -18,7 +18,7 @@ locals {
 
 module "gke" {
   source                               = "terraform-google-modules/kubernetes-engine/google"
-  version                              = "32.0.1"
+  version                              = "33.0.0"
   project_id                           = var.project_id
   regional                             = var.cluster_regional
   name                                 = var.cluster_name