fix: limit TPG < 6.10 (#2183)

apeabody · web-flow · commit 3122b9d6ef65 · 2024-11-14T09:47:21.000-08:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"

Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,11 @@ terraform {`
`21`	`21`	`required_providers {`
`22`	`22`	`google = {`
`23`	`23`	`source = "hashicorp/google"`
`24`		`- version = ">= 6.5.0, < 7"`
	`24`	`+ version = ">= 6.5.0, < 6.10.0"`
`25`	`25`	`}`
`26`	`26`	`google-beta = {`
`27`	`27`	`source = "hashicorp/google-beta"`
`28`		`- version = ">= 6.5.0, < 7"`
	`28`	`+ version = ">= 6.5.0, < 6.10.0"`
`29`	`29`	`}`
`30`	`30`	`kubernetes = {`
`31`	`31`	`source = "hashicorp/kubernetes"`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ terraform {`
`21`	`21`	`required_providers {`
`22`	`22`	`google = {`
`23`	`23`	`source = "hashicorp/google"`
`24`		`- version = ">= 6.7.0, < 7"`
	`24`	`+ version = ">= 6.7.0, < 6.10.0"`
`25`	`25`	`}`
`26`	`26`	`kubernetes = {`
`27`	`27`	`source = "hashicorp/kubernetes"`