From 8d2a77cac5144df27f9b62e74b49136617a8924b Mon Sep 17 00:00:00 2001 From: Gen Lu Date: Wed, 11 Sep 2024 17:25:08 +0000 Subject: [PATCH 1/2] fix: upgrade gke module to avoid TPGv5.44.0 with Autopilot Change-Id: I716787e0dd8699b36d919feb5c42de6d6ccdbcb5 --- infrastructure/versions.tf | 3 ++- 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, 6 insertions(+), 5 deletions(-) diff --git a/infrastructure/versions.tf b/infrastructure/versions.tf index b8e6f2c71..593425097 100644 --- a/infrastructure/versions.tf +++ b/infrastructure/versions.tf @@ -18,7 +18,8 @@ terraform { source = "hashicorp/google" } google-beta = { - source = "hashicorp/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 From 3307f4029f504c41c0ee4bf5aa4b459a1c07ca43 Mon Sep 17 00:00:00 2001 From: Gen Lu Date: Wed, 11 Sep 2024 18:27:43 +0000 Subject: [PATCH 2/2] fix: lint Change-Id: I61db44be22cc2a82513a700f1f8f1360596c913e --- infrastructure/versions.tf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/infrastructure/versions.tf b/infrastructure/versions.tf index 593425097..e4e2c02b4 100644 --- a/infrastructure/versions.tf +++ b/infrastructure/versions.tf @@ -18,8 +18,9 @@ terraform { source = "hashicorp/google" } google-beta = { - source = "hashicorp/google-beta" - version = ">= 5.40.0, != 5.44.0, !=6.2.0" + source = "hashicorp/google-beta" + # Creating Autopilot using GKE submodule is broken in v6.2.0. + version = ">= 5.40.0, !=6.2.0" } helm = { source = "hashicorp/helm"