From 00547722ad4839a56bec38efc710b78f1353ed40 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Thu, 14 Nov 2024 01:33:03 +0000 Subject: [PATCH] fix: limit TPG < 6.10 --- autogen/main/versions.tf.tmpl | 52 +++---------------- .../versions.tf | 4 +- .../beta-autopilot-public-cluster/versions.tf | 4 +- .../versions.tf | 4 +- modules/beta-private-cluster/versions.tf | 4 +- .../versions.tf | 4 +- modules/beta-public-cluster/versions.tf | 4 +- .../versions.tf | 2 +- modules/private-cluster/versions.tf | 2 +- versions.tf | 2 +- 10 files changed, 23 insertions(+), 59 deletions(-) diff --git a/autogen/main/versions.tf.tmpl b/autogen/main/versions.tf.tmpl index d8c743ee23..dfe045116b 100644 --- a/autogen/main/versions.tf.tmpl +++ b/autogen/main/versions.tf.tmpl @@ -24,70 +24,35 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.7.0, < 7" + version = ">= 6.7.0, < 6.10.0" } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.7.0, < 7" + version = ">= 6.7.0, < 6.10.0" } - kubernetes = { - source = "hashicorp/kubernetes" - version = "~> 2.10" - } - random = { - source = "hashicorp/random" - version = ">= 2.1" - } - } - provider_meta "google-beta" { - module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0" - } {% elif beta_cluster and autopilot_cluster %} required_providers { google = { source = "hashicorp/google" - version = ">= 6.5.0, < 7" + version = ">= 6.5.0, < 6.10.0" } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.5.0, < 7" + version = ">= 6.5.0, < 6.10.0" } - kubernetes = { - source = "hashicorp/kubernetes" - version = "~> 2.10" - } - random = { - source = "hashicorp/random" - version = ">= 2.1" - } - } - provider_meta "google-beta" { - module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0" - } {% elif autopilot_cluster %} required_providers { google = { source = "hashicorp/google" - version = ">= 6.5.0, < 7" + version = ">= 6.5.0, < 6.10.0" } - kubernetes = { - source = "hashicorp/kubernetes" - version = "~> 2.10" - } - random = { - source = "hashicorp/random" - version = ">= 2.1" - } - } - provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0" - } {% else %} required_providers { google = { source = "hashicorp/google" - version = ">= 6.7.0, < 7" + version = ">= 6.7.0, < 6.10.0" } +{% endif %} kubernetes = { source = "hashicorp/kubernetes" version = "~> 2.10" @@ -97,8 +62,7 @@ terraform { version = ">= 2.1" } } - provider_meta "google" { + provider_meta "{% if beta_cluster %}google-beta{% else %}google{% endif %}" { module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0" } -{% endif %} } diff --git a/modules/beta-autopilot-private-cluster/versions.tf b/modules/beta-autopilot-private-cluster/versions.tf index fa5a37cf4d..8e5ff21d14 100644 --- a/modules/beta-autopilot-private-cluster/versions.tf +++ b/modules/beta-autopilot-private-cluster/versions.tf @@ -21,11 +21,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.5.0, < 7" + version = ">= 6.5.0, < 6.10.0" } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.5.0, < 7" + version = ">= 6.5.0, < 6.10.0" } kubernetes = { source = "hashicorp/kubernetes" diff --git a/modules/beta-autopilot-public-cluster/versions.tf b/modules/beta-autopilot-public-cluster/versions.tf index 4b0b9c8043..e0817eba82 100644 --- a/modules/beta-autopilot-public-cluster/versions.tf +++ b/modules/beta-autopilot-public-cluster/versions.tf @@ -21,11 +21,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.5.0, < 7" + version = ">= 6.5.0, < 6.10.0" } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.5.0, < 7" + version = ">= 6.5.0, < 6.10.0" } kubernetes = { source = "hashicorp/kubernetes" diff --git a/modules/beta-private-cluster-update-variant/versions.tf b/modules/beta-private-cluster-update-variant/versions.tf index e6ad954675..d058eb6bff 100644 --- a/modules/beta-private-cluster-update-variant/versions.tf +++ b/modules/beta-private-cluster-update-variant/versions.tf @@ -21,11 +21,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.7.0, < 7" + version = ">= 6.7.0, < 6.10.0" } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.7.0, < 7" + version = ">= 6.7.0, < 6.10.0" } kubernetes = { source = "hashicorp/kubernetes" diff --git a/modules/beta-private-cluster/versions.tf b/modules/beta-private-cluster/versions.tf index e4000c1395..5a6fad85db 100644 --- a/modules/beta-private-cluster/versions.tf +++ b/modules/beta-private-cluster/versions.tf @@ -21,11 +21,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.7.0, < 7" + version = ">= 6.7.0, < 6.10.0" } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.7.0, < 7" + version = ">= 6.7.0, < 6.10.0" } kubernetes = { source = "hashicorp/kubernetes" diff --git a/modules/beta-public-cluster-update-variant/versions.tf b/modules/beta-public-cluster-update-variant/versions.tf index f6240f6090..6966ce4fba 100644 --- a/modules/beta-public-cluster-update-variant/versions.tf +++ b/modules/beta-public-cluster-update-variant/versions.tf @@ -21,11 +21,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.7.0, < 7" + version = ">= 6.7.0, < 6.10.0" } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.7.0, < 7" + version = ">= 6.7.0, < 6.10.0" } kubernetes = { source = "hashicorp/kubernetes" diff --git a/modules/beta-public-cluster/versions.tf b/modules/beta-public-cluster/versions.tf index 6b8c859486..8910f4ff3e 100644 --- a/modules/beta-public-cluster/versions.tf +++ b/modules/beta-public-cluster/versions.tf @@ -21,11 +21,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.7.0, < 7" + version = ">= 6.7.0, < 6.10.0" } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.7.0, < 7" + version = ">= 6.7.0, < 6.10.0" } kubernetes = { source = "hashicorp/kubernetes" diff --git a/modules/private-cluster-update-variant/versions.tf b/modules/private-cluster-update-variant/versions.tf index 50d825967e..4536948366 100644 --- a/modules/private-cluster-update-variant/versions.tf +++ b/modules/private-cluster-update-variant/versions.tf @@ -21,7 +21,7 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.7.0, < 7" + version = ">= 6.7.0, < 6.10.0" } kubernetes = { source = "hashicorp/kubernetes" diff --git a/modules/private-cluster/versions.tf b/modules/private-cluster/versions.tf index ce566c254c..112c61e4f8 100644 --- a/modules/private-cluster/versions.tf +++ b/modules/private-cluster/versions.tf @@ -21,7 +21,7 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.7.0, < 7" + version = ">= 6.7.0, < 6.10.0" } kubernetes = { source = "hashicorp/kubernetes" diff --git a/versions.tf b/versions.tf index 999d0bf22e..3e3a4262db 100644 --- a/versions.tf +++ b/versions.tf @@ -21,7 +21,7 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.7.0, < 7" + version = ">= 6.7.0, < 6.10.0" } kubernetes = { source = "hashicorp/kubernetes"