Merge branch 'master' into ooshrioo/compute-vm-gpu

GoogleCloudPlatform · Nov 18, 2024 · a8a6158 · a8a6158
2 parents 84bf971 + c60d152
commit a8a6158
Show file tree

Hide file tree

Showing 140 changed files with 312 additions and 276 deletions.
diff --git a/blueprints/apigee/apigee-x-foundations/README.md b/blueprints/apigee/apigee-x-foundations/README.md
@@ -501,4 +501,5 @@ module "apigee-x-foundations" {
 | [int_lbs](outputs.tf#L71) | Internal LBs. |  |  |
 | [project](outputs.tf#L76) | Project. |  |  |
 | [project_id](outputs.tf#L81) | Project id. |  |  |
+| [psc_negs](outputs.tf#L86) | PSC NEGs. |  |  |
 <!-- END TFDOC -->
diff --git a/blueprints/apigee/apigee-x-foundations/outputs.tf b/blueprints/apigee/apigee-x-foundations/outputs.tf
@@ -82,3 +82,8 @@ output "project_id" {
   description = "Project id."
   value       = module.project.project_id
 }
+
+output "psc_negs" {
+  description = "PSC NEGs."
+  value       = google_compute_region_network_endpoint_group.psc_negs
+}
diff --git a/blueprints/gke/patterns/autopilot-cluster/versions.tf b/blueprints/gke/patterns/autopilot-cluster/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/blueprints/gke/patterns/batch/versions.tf b/blueprints/gke/patterns/batch/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/blueprints/gke/patterns/kafka/versions.tf b/blueprints/gke/patterns/kafka/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/blueprints/gke/patterns/kong-cloudrun/versions.tf b/blueprints/gke/patterns/kong-cloudrun/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/blueprints/gke/patterns/mysql/versions.tf b/blueprints/gke/patterns/mysql/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/blueprints/gke/patterns/redis-cluster/versions.tf b/blueprints/gke/patterns/redis-cluster/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/blueprints/secops/secops-gke-forwarder/versions.tf b/blueprints/secops/secops-gke-forwarder/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/default-versions.tf b/default-versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/modules/__experimental_deprecated/alloydb-instance/versions.tf b/modules/__experimental_deprecated/alloydb-instance/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/modules/__experimental_deprecated/net-neg/versions.tf b/modules/__experimental_deprecated/net-neg/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/modules/__experimental_deprecated/project-iam-magic/versions.tf b/modules/__experimental_deprecated/project-iam-magic/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/modules/alloydb/versions.tf b/modules/alloydb/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/modules/analytics-hub/versions.tf b/modules/analytics-hub/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/modules/api-gateway/versions.tf b/modules/api-gateway/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/modules/apigee/versions.tf b/modules/apigee/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/modules/artifact-registry/versions.tf b/modules/artifact-registry/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/modules/bigquery-dataset/versions.tf b/modules/bigquery-dataset/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/modules/bigtable-instance/versions.tf b/modules/bigtable-instance/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/modules/billing-account/versions.tf b/modules/billing-account/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/modules/binauthz/versions.tf b/modules/binauthz/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/modules/certificate-authority-service/versions.tf b/modules/certificate-authority-service/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/modules/certificate-manager/versions.tf b/modules/certificate-manager/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/modules/cloud-config-container/__need_fixing/onprem/versions.tf b/modules/cloud-config-container/__need_fixing/onprem/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/modules/cloud-config-container/__need_fixing/squid/versions.tf b/modules/cloud-config-container/__need_fixing/squid/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/modules/cloud-config-container/bindplane/versions.tf b/modules/cloud-config-container/bindplane/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/modules/cloud-config-container/coredns/versions.tf b/modules/cloud-config-container/coredns/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }
diff --git a/modules/cloud-config-container/cos-generic-metadata/versions.tf b/modules/cloud-config-container/cos-generic-metadata/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.1.0, < 7.0.0" # tftest
+      version = ">= 6.11.2, < 7.0.0" # tftest
     }
   }
 }