diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddd8b0c9..59e4d371 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,15 @@ All notable changes to this project will be documented in this file.
### BLUEPRINTS
+- [[#1106](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1106)] Network Dashboard: PSA support for Filestore and Memorystore ([aurelienlegrand](https://github.com/aurelienlegrand))
+- [[#1110](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1110)] Bump cookiejar from 2.1.3 to 2.1.4 in /blueprints/apigee/bigquery-analytics/functions/export ([dependabot[bot]](https://github.com/dependabot[bot]))
+- [[#1097](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1097)] Use terraform resource to activate Anthos Service Mesh ([wiktorn](https://github.com/wiktorn))
+- [[#1104](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1104)] Updated apigee hybrid for gke README ([apichick](https://github.com/apichick))
+- [[#1107](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1107)] Check linting for Python dashboard files ([ludoo](https://github.com/ludoo))
+- [[#1102](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1102)] Improvements in apigee hybrid-gke: now using workload identity and GLB ([apichick](https://github.com/apichick))
+- [[#1098](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1098)] Add shared-vpc support on data-playground blueprint ([lcaggio](https://github.com/lcaggio))
+- [[#1095](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1095)] [Data Platform] Fix Table in readme ([lcaggio](https://github.com/lcaggio))
+- [[#1089](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1089)] Update Data Platform ([lcaggio](https://github.com/lcaggio))
- [[#1081](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1081)] Apigee hybrid on GKE ([apichick](https://github.com/apichick))
- [[#1082](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1082)] Fixes in Apigee Bigquery Analytics blueprint ([apichick](https://github.com/apichick))
- [[#1071](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1071)] Moved apigee bigquery analytics blueprint, added apigee network patterns ([apichick](https://github.com/apichick))
@@ -20,6 +29,8 @@ All notable changes to this project will be documented in this file.
### DOCUMENTATION
+- [[#1101](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1101)] First batch of testing updates to core modules ([juliocc](https://github.com/juliocc))
+- [[#1089](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1089)] Update Data Platform ([lcaggio](https://github.com/lcaggio))
- [[#1084](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1084)] Fixes in Apigee blueprints README files ([apichick](https://github.com/apichick))
- [[#1081](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1081)] Apigee hybrid on GKE ([apichick](https://github.com/apichick))
- [[#1074](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1074)] Adding new section for Authentication issues ([agutta](https://github.com/agutta))
@@ -28,6 +39,9 @@ All notable changes to this project will be documented in this file.
### FAST
+- [[#1118](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1118)] Add missing logging admin role for initial user ([ludoo](https://github.com/ludoo))
+- [[#1099](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1099)] Fix destroy in stage 1 outputs ([ludoo](https://github.com/ludoo))
+- [[#1089](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1089)] Update Data Platform ([lcaggio](https://github.com/lcaggio))
- [[#1085](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1085)] fix restricted services not being added to the perimeter configurations ([drebes](https://github.com/drebes))
- [[#1057](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1057)] Adding new file FAQ and an image ([agutta](https://github.com/agutta))
- [[#1054](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1054)] FAST: fix typo in bootstrap stage README ([agutta](https://github.com/agutta))
@@ -35,6 +49,14 @@ All notable changes to this project will be documented in this file.
### MODULES
+- [[#1116](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1116)] Include cloudbuild API in project module ([aymanfarhat](https://github.com/aymanfarhat))
+- [[#1115](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1115)] add new parameters support in apigee module ([blackillzone](https://github.com/blackillzone))
+- [[#1112](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1112)] Add HTTPS frontend with SNEG example ([juliodiez](https://github.com/juliodiez))
+- [[#1097](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1097)] Use terraform resource to activate Anthos Service Mesh ([wiktorn](https://github.com/wiktorn))
+- [[#1101](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1101)] First batch of testing updates to core modules ([juliocc](https://github.com/juliocc))
+- [[#1098](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1098)] Add shared-vpc support on data-playground blueprint ([lcaggio](https://github.com/lcaggio))
+- [[#1096](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1096)] [VPC-SC] Add support for scoped Policies ([lcaggio](https://github.com/lcaggio))
+- [[#1093](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1093)] Added tags to gke-cluster module ([apichick](https://github.com/apichick))
- [[#1078](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1078)] Fixed delete_rule in compute-mig module for stateful disks ([rosmo](https://github.com/rosmo))
- [[#1080](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1080)] Added device_name field to compute-vm attached_disks parameter ([rosmo](https://github.com/rosmo))
- [[#1079](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1079)] Reorder org policy rules ([juliocc](https://github.com/juliocc))
@@ -53,6 +75,8 @@ All notable changes to this project will be documented in this file.
### TOOLS
+- [[#1107](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1107)] Check linting for Python dashboard files ([ludoo](https://github.com/ludoo))
+- [[#1101](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1101)] First batch of testing updates to core modules ([juliocc](https://github.com/juliocc))
- [[#1091](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1091)] Fix check_documentation output ([juliocc](https://github.com/juliocc))
- [[#1053](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1053)] Extend inventory-based testing to examples ([juliocc](https://github.com/juliocc))
diff --git a/blueprints/apigee/bigquery-analytics/README.md b/blueprints/apigee/bigquery-analytics/README.md
index 361610a7..027f28ea 100644
--- a/blueprints/apigee/bigquery-analytics/README.md
+++ b/blueprints/apigee/bigquery-analytics/README.md
@@ -60,14 +60,14 @@ Do the following to verify that everything works as expected.
|---|---|:---:|:---:|:---:|
| [envgroups](variables.tf#L24) | Environment groups (NAME => [HOSTNAMES]). | map(list(string))
| ✓ | |
| [environments](variables.tf#L30) | Environments. | map(object({…}))
| ✓ | |
-| [instances](variables.tf#L45) | Instance. | map(object({…}))
| ✓ | |
-| [project_id](variables.tf#L91) | Project ID. | string
| ✓ | |
-| [psc_config](variables.tf#L97) | PSC configuration. | map(string)
| ✓ | |
+| [instances](variables.tf#L45) | Instance. | map(object({…}))
| ✓ | |
+| [project_id](variables.tf#L92) | Project ID. | string
| ✓ | |
+| [psc_config](variables.tf#L98) | PSC configuration. | map(string)
| ✓ | |
| [datastore_name](variables.tf#L17) | Datastore. | string
| | "gcs"
|
-| [organization](variables.tf#L59) | Apigee organization. | object({…})
| | {…}
|
-| [path](variables.tf#L75) | Bucket path. | string
| | "/analytics"
|
-| [project_create](variables.tf#L82) | Parameters for the creation of the new project. | object({…})
| | null
|
-| [vpc_create](variables.tf#L103) | Boolean flag indicating whether the VPC should be created or not. | bool
| | true
|
+| [organization](variables.tf#L60) | Apigee organization. | object({…})
| | {…}
|
+| [path](variables.tf#L76) | Bucket path. | string
| | "/analytics"
|
+| [project_create](variables.tf#L83) | Parameters for the creation of the new project. | object({…})
| | null
|
+| [vpc_create](variables.tf#L104) | Boolean flag indicating whether the VPC should be created or not. | bool
| | true
|
## Outputs
diff --git a/blueprints/apigee/bigquery-analytics/main.tf b/blueprints/apigee/bigquery-analytics/main.tf
index 8ecca62a..68e672d2 100644
--- a/blueprints/apigee/bigquery-analytics/main.tf
+++ b/blueprints/apigee/bigquery-analytics/main.tf
@@ -68,9 +68,12 @@ module "vpc" {
region = k
}]
psa_config = {
- ranges = {
- for k, v in var.instances : "apigee-${k}" => v.psa_ip_cidr_range
- }
+ ranges = merge({ for k, v in var.instances :
+ "apigee-runtime-${k}" => v.runtime_ip_cidr_range
+ }, { for k, v in var.instances :
+ "apigee-troubleshooting-${k}" => v.troubleshooting_ip_cidr_range
+ }
+ )
}
}
diff --git a/blueprints/apigee/bigquery-analytics/terraform.tfvars.sample b/blueprints/apigee/bigquery-analytics/terraform.tfvars.sample
index db421321..5a25a9f3 100644
--- a/blueprints/apigee/bigquery-analytics/terraform.tfvars.sample
+++ b/blueprints/apigee/bigquery-analytics/terraform.tfvars.sample
@@ -15,7 +15,8 @@ instances = {
instance-ew1 = {
region = "europe-west1"
environments = ["apis-test"]
- psa_ip_cidr_range = "10.0.4.0/22"
+ runtime_ip_cidr_range = "10.0.4.0/22"
+ troubleshooting_ip_cidr_range = "10.1.1.0/28"
}
}
psc_config = {
diff --git a/blueprints/apigee/bigquery-analytics/variables.tf b/blueprints/apigee/bigquery-analytics/variables.tf
index ba7f5d78..1bd6cb0a 100644
--- a/blueprints/apigee/bigquery-analytics/variables.tf
+++ b/blueprints/apigee/bigquery-analytics/variables.tf
@@ -45,13 +45,14 @@ variable "environments" {
variable "instances" {
description = "Instance."
type = map(object({
- display_name = optional(string)
- description = optional(string)
- region = string
- environments = list(string)
- psa_ip_cidr_range = string
- disk_encryption_key = optional(string)
- consumer_accept_list = optional(list(string))
+ display_name = optional(string)
+ description = optional(string)
+ region = string
+ environments = list(string)
+ runtime_ip_cidr_range = string
+ troubleshooting_ip_cidr_range = string
+ disk_encryption_key = optional(string)
+ consumer_accept_list = optional(list(string))
}))
nullable = false
}
diff --git a/blueprints/apigee/bigquery-analytics/versions.tf b/blueprints/apigee/bigquery-analytics/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/apigee/bigquery-analytics/versions.tf
+++ b/blueprints/apigee/bigquery-analytics/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/README.md b/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/README.md
index 21bd9940..690458f0 100644
--- a/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/README.md
+++ b/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/README.md
@@ -46,18 +46,19 @@ Do the following to verify that everything works as expected.
| name | description | type | required | default |
|---|---|:---:|:---:|:---:|
| [apigee_project_id](variables.tf#L17) | Project ID. | string
| ✓ | |
-| [billing_account_id](variables.tf#L47) | Parameters for the creation of the new project. | string
| ✓ | |
-| [hostname](variables.tf#L52) | Host name. | string
| ✓ | |
-| [onprem_project_id](variables.tf#L57) | Project ID. | string
| ✓ | |
-| [parent](variables.tf#L75) | Parent (organizations/organizationID or folders/folderID). | string
| ✓ | |
+| [billing_account_id](variables.tf#L53) | Parameters for the creation of the new project. | string
| ✓ | |
+| [hostname](variables.tf#L58) | Host name. | string
| ✓ | |
+| [onprem_project_id](variables.tf#L63) | Project ID. | string
| ✓ | |
+| [parent](variables.tf#L81) | Parent (organizations/organizationID or folders/folderID). | string
| ✓ | |
| [apigee_proxy_only_subnet_ip_cidr_range](variables.tf#L23) | Subnet IP CIDR range. | string
| | "10.2.1.0/24"
|
-| [apigee_psa_ip_cidr_range](variables.tf#L29) | Apigee PSA IP CIDR range. | string
| | "10.0.4.0/22"
|
-| [apigee_psc_subnet_ip_cidr_range](variables.tf#L35) | Subnet IP CIDR range. | string
| | "10.2.2.0/24"
|
+| [apigee_psc_subnet_ip_cidr_range](variables.tf#L29) | Subnet IP CIDR range. | string
| | "10.2.2.0/24"
|
+| [apigee_runtime_ip_cidr_range](variables.tf#L35) | Apigee PSA IP CIDR range. | string
| | "10.0.4.0/22"
|
| [apigee_subnet_ip_cidr_range](variables.tf#L41) | Subnet IP CIDR range. | string
| | "10.2.0.0/24"
|
-| [onprem_proxy_only_subnet_ip_cidr_range](variables.tf#L63) | Subnet IP CIDR range. | string
| | "10.1.1.0/24"
|
-| [onprem_subnet_ip_cidr_range](variables.tf#L69) | Subnet IP CIDR range. | string
| | "10.1.0.0/24"
|
-| [region](variables.tf#L80) | Region. | string
| | "europe-west1"
|
-| [zone](variables.tf#L86) | Zone. | string
| | "europe-west1-c"
|
+| [apigee_troubleshooting_ip_cidr_range](variables.tf#L47) | Apigee PSA IP CIDR range. | string
| | "10.1.0.0/28"
|
+| [onprem_proxy_only_subnet_ip_cidr_range](variables.tf#L69) | Subnet IP CIDR range. | string
| | "10.1.1.0/24"
|
+| [onprem_subnet_ip_cidr_range](variables.tf#L75) | Subnet IP CIDR range. | string
| | "10.1.0.0/24"
|
+| [region](variables.tf#L86) | Region. | string
| | "europe-west1"
|
+| [zone](variables.tf#L92) | Zone. | string
| | "europe-west1-c"
|
## Outputs
diff --git a/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/apigee.tf b/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/apigee.tf
index 0e4faabf..8860e404 100644
--- a/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/apigee.tf
+++ b/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/apigee.tf
@@ -57,7 +57,8 @@ module "apigee_vpc" {
}]
psa_config = {
ranges = {
- "apigee" = var.apigee_psa_ip_cidr_range
+ "apigee-runtime" = var.apigee_runtime_ip_cidr_range
+ "apigee-troubleshooting" = var.apigee_troubleshooting_ip_cidr_range
}
}
}
@@ -79,9 +80,10 @@ module "apigee" {
}
instances = {
instance-1 = {
- region = var.region
- environments = [local.environment]
- psa_ip_cidr_range = var.apigee_psa_ip_cidr_range
+ region = var.region
+ environments = [local.environment]
+ runtime_ip_cidr_range = var.apigee_runtime_ip_cidr_range
+ troubleshooting_ip_cidr_range = var.apigee_troubleshooting_ip_cidr_range
}
}
endpoint_attachments = {
diff --git a/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/variables.tf b/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/variables.tf
index 5d28ab9f..86a720e7 100644
--- a/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/variables.tf
+++ b/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/variables.tf
@@ -26,24 +26,30 @@ variable "apigee_proxy_only_subnet_ip_cidr_range" {
default = "10.2.1.0/24"
}
-variable "apigee_psa_ip_cidr_range" {
- description = "Apigee PSA IP CIDR range."
- type = string
- default = "10.0.4.0/22"
-}
-
variable "apigee_psc_subnet_ip_cidr_range" {
description = "Subnet IP CIDR range."
type = string
default = "10.2.2.0/24"
}
+variable "apigee_runtime_ip_cidr_range" {
+ description = "Apigee PSA IP CIDR range."
+ type = string
+ default = "10.0.4.0/22"
+}
+
variable "apigee_subnet_ip_cidr_range" {
description = "Subnet IP CIDR range."
type = string
default = "10.2.0.0/24"
}
+variable "apigee_troubleshooting_ip_cidr_range" {
+ description = "Apigee PSA IP CIDR range."
+ type = string
+ default = "10.1.0.0/28"
+}
+
variable "billing_account_id" {
description = "Parameters for the creation of the new project."
type = string
diff --git a/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/versions.tf b/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/versions.tf
+++ b/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/cloud-operations/adfs/versions.tf b/blueprints/cloud-operations/adfs/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/cloud-operations/adfs/versions.tf
+++ b/blueprints/cloud-operations/adfs/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/cloud-operations/asset-inventory-feed-remediation/versions.tf b/blueprints/cloud-operations/asset-inventory-feed-remediation/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/cloud-operations/asset-inventory-feed-remediation/versions.tf
+++ b/blueprints/cloud-operations/asset-inventory-feed-remediation/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/cloud-operations/dns-fine-grained-iam/versions.tf b/blueprints/cloud-operations/dns-fine-grained-iam/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/cloud-operations/dns-fine-grained-iam/versions.tf
+++ b/blueprints/cloud-operations/dns-fine-grained-iam/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/cloud-operations/dns-shared-vpc/versions.tf b/blueprints/cloud-operations/dns-shared-vpc/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/cloud-operations/dns-shared-vpc/versions.tf
+++ b/blueprints/cloud-operations/dns-shared-vpc/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/cloud-operations/iam-delegated-role-grants/versions.tf b/blueprints/cloud-operations/iam-delegated-role-grants/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/cloud-operations/iam-delegated-role-grants/versions.tf
+++ b/blueprints/cloud-operations/iam-delegated-role-grants/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/cloud-operations/onprem-sa-key-management/versions.tf b/blueprints/cloud-operations/onprem-sa-key-management/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/cloud-operations/onprem-sa-key-management/versions.tf
+++ b/blueprints/cloud-operations/onprem-sa-key-management/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/cloud-operations/packer-image-builder/versions.tf b/blueprints/cloud-operations/packer-image-builder/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/cloud-operations/packer-image-builder/versions.tf
+++ b/blueprints/cloud-operations/packer-image-builder/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/cloud-operations/quota-monitoring/versions.tf b/blueprints/cloud-operations/quota-monitoring/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/cloud-operations/quota-monitoring/versions.tf
+++ b/blueprints/cloud-operations/quota-monitoring/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf b/blueprints/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf
+++ b/blueprints/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/cloud-operations/terraform-enterprise-wif/tfc-workflow-using-wif/tfc-oidc/versions.tf b/blueprints/cloud-operations/terraform-enterprise-wif/tfc-workflow-using-wif/tfc-oidc/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/cloud-operations/terraform-enterprise-wif/tfc-workflow-using-wif/tfc-oidc/versions.tf
+++ b/blueprints/cloud-operations/terraform-enterprise-wif/tfc-workflow-using-wif/tfc-oidc/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/data-solutions/cmek-via-centralized-kms/versions.tf b/blueprints/data-solutions/cmek-via-centralized-kms/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/data-solutions/cmek-via-centralized-kms/versions.tf
+++ b/blueprints/data-solutions/cmek-via-centralized-kms/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/data-solutions/data-playground/versions.tf b/blueprints/data-solutions/data-playground/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/data-solutions/data-playground/versions.tf
+++ b/blueprints/data-solutions/data-playground/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/data-solutions/gcs-to-bq-with-least-privileges/versions.tf b/blueprints/data-solutions/gcs-to-bq-with-least-privileges/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/data-solutions/gcs-to-bq-with-least-privileges/versions.tf
+++ b/blueprints/data-solutions/gcs-to-bq-with-least-privileges/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/factories/net-vpc-firewall-yaml/versions.tf b/blueprints/factories/net-vpc-firewall-yaml/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/factories/net-vpc-firewall-yaml/versions.tf
+++ b/blueprints/factories/net-vpc-firewall-yaml/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/gke/multitenant-fleet/README.md b/blueprints/gke/multitenant-fleet/README.md
index ce14b5a0..1e09afaa 100644
--- a/blueprints/gke/multitenant-fleet/README.md
+++ b/blueprints/gke/multitenant-fleet/README.md
@@ -115,7 +115,7 @@ module "gke-fleet" {
vpc_self_link = "projects/prj-host/global/networks/prod-0"
}
}
-# tftest modules=7 resources=26
+# tftest modules=7 resources=27
```
## GKE Fleet
@@ -224,7 +224,7 @@ module "gke" {
}
}
-# tftest modules=8 resources=37
+# tftest modules=8 resources=38
```
diff --git a/blueprints/networking/__need_fixing/nginx-reverse-proxy-cluster/versions.tf b/blueprints/networking/__need_fixing/nginx-reverse-proxy-cluster/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/networking/__need_fixing/nginx-reverse-proxy-cluster/versions.tf
+++ b/blueprints/networking/__need_fixing/nginx-reverse-proxy-cluster/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/networking/__need_fixing/onprem-google-access-dns/versions.tf b/blueprints/networking/__need_fixing/onprem-google-access-dns/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/networking/__need_fixing/onprem-google-access-dns/versions.tf
+++ b/blueprints/networking/__need_fixing/onprem-google-access-dns/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/networking/decentralized-firewall/versions.tf b/blueprints/networking/decentralized-firewall/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/networking/decentralized-firewall/versions.tf
+++ b/blueprints/networking/decentralized-firewall/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/networking/filtering-proxy-psc/versions.tf b/blueprints/networking/filtering-proxy-psc/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/networking/filtering-proxy-psc/versions.tf
+++ b/blueprints/networking/filtering-proxy-psc/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/networking/filtering-proxy/versions.tf b/blueprints/networking/filtering-proxy/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/networking/filtering-proxy/versions.tf
+++ b/blueprints/networking/filtering-proxy/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/networking/hub-and-spoke-peering/versions.tf b/blueprints/networking/hub-and-spoke-peering/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/networking/hub-and-spoke-peering/versions.tf
+++ b/blueprints/networking/hub-and-spoke-peering/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/networking/hub-and-spoke-vpn/versions.tf b/blueprints/networking/hub-and-spoke-vpn/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/networking/hub-and-spoke-vpn/versions.tf
+++ b/blueprints/networking/hub-and-spoke-vpn/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/networking/ilb-next-hop/versions.tf b/blueprints/networking/ilb-next-hop/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/networking/ilb-next-hop/versions.tf
+++ b/blueprints/networking/ilb-next-hop/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/networking/private-cloud-function-from-onprem/versions.tf b/blueprints/networking/private-cloud-function-from-onprem/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/networking/private-cloud-function-from-onprem/versions.tf
+++ b/blueprints/networking/private-cloud-function-from-onprem/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/networking/shared-vpc-gke/versions.tf b/blueprints/networking/shared-vpc-gke/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/networking/shared-vpc-gke/versions.tf
+++ b/blueprints/networking/shared-vpc-gke/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/blueprints/third-party-solutions/openshift/tf/versions.tf b/blueprints/third-party-solutions/openshift/tf/versions.tf
index 90b632f6..4900174a 100644
--- a/blueprints/third-party-solutions/openshift/tf/versions.tf
+++ b/blueprints/third-party-solutions/openshift/tf/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/default-versions.tf b/default-versions.tf
index 90b632f6..4900174a 100644
--- a/default-versions.tf
+++ b/default-versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/__experimental/net-neg/versions.tf b/modules/__experimental/net-neg/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/__experimental/net-neg/versions.tf
+++ b/modules/__experimental/net-neg/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/api-gateway/versions.tf b/modules/api-gateway/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/api-gateway/versions.tf
+++ b/modules/api-gateway/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/apigee/README.md b/modules/apigee/README.md
index 02b1d13f..0f3daa56 100644
--- a/modules/apigee/README.md
+++ b/modules/apigee/README.md
@@ -44,14 +44,16 @@ module "apigee" {
}
instances = {
instance-test-ew1 = {
- region = "europe-west1"
- environments = ["apis-test"]
- psa_ip_cidr_range = "10.0.4.0/22"
+ region = "europe-west1"
+ environments = ["apis-test"]
+ runtime_ip_cidr_range = "10.0.4.0/22"
+ troubleshooting_ip_cidr_range = "10.1.1.0.0/28"
}
instance-prod-ew3 = {
- region = "europe-west3"
- environments = ["apis-prod"]
- psa_ip_cidr_range = "10.0.5.0/22"
+ region = "europe-west3"
+ environments = ["apis-prod"]
+ runtime_ip_cidr_range = "10.0.8.0/22"
+ troubleshooting_ip_cidr_range = "10.1.16.0/28"
}
}
endpoint_attachments = {
@@ -141,9 +143,10 @@ module "apigee" {
project_id = "my-project"
instances = {
instance-test-ew1 = {
- region = "europe-west1"
- environments = ["apis-test"]
- psa_ip_cidr_range = "10.0.4.0/22"
+ region = "europe-west1"
+ environments = ["apis-test"]
+ runtime_ip_cidr_range = "10.0.4.0/22"
+ troubleshooting_ip_cidr_range = "10.1.1.0/28"
}
}
}
@@ -173,12 +176,12 @@ module "apigee" {
| name | description | type | required | default |
|---|---|:---:|:---:|:---:|
-| [project_id](variables.tf#L77) | Project ID. | string
| ✓ | |
+| [project_id](variables.tf#L78) | Project ID. | string
| ✓ | |
| [endpoint_attachments](variables.tf#L17) | Endpoint attachments. | map(object({…}))
| | null
|
| [envgroups](variables.tf#L26) | Environment groups (NAME => [HOSTNAMES]). | map(list(string))
| | null
|
| [environments](variables.tf#L32) | Environments. | map(object({…}))
| | null
|
-| [instances](variables.tf#L49) | Instances. | map(object({…}))
| | null
|
-| [organization](variables.tf#L63) | Apigee organization. If set to null the organization must already exist. | object({…})
| | null
|
+| [instances](variables.tf#L49) | Instances. | map(object({…}))
| | null
|
+| [organization](variables.tf#L64) | Apigee organization. If set to null the organization must already exist. | object({…})
| | null
|
## Outputs
diff --git a/modules/apigee/main.tf b/modules/apigee/main.tf
index f1c71ec1..aa2d076a 100644
--- a/modules/apigee/main.tf
+++ b/modules/apigee/main.tf
@@ -93,7 +93,7 @@ resource "google_apigee_instance" "instances" {
description = each.value.description
location = each.value.region
org_id = local.org_id
- ip_range = each.value.psa_ip_cidr_range
+ ip_range = "${each.value.runtime_ip_cidr_range},${each.value.troubleshooting_ip_cidr_range}"
disk_encryption_key_name = each.value.disk_encryption_key
consumer_accept_list = each.value.consumer_accept_list
}
diff --git a/modules/apigee/variables.tf b/modules/apigee/variables.tf
index 81cf77f6..00961aac 100644
--- a/modules/apigee/variables.tf
+++ b/modules/apigee/variables.tf
@@ -49,13 +49,14 @@ variable "environments" {
variable "instances" {
description = "Instances."
type = map(object({
- display_name = optional(string)
- description = optional(string, "Terraform-managed")
- region = string
- environments = list(string)
- psa_ip_cidr_range = string
- disk_encryption_key = optional(string)
- consumer_accept_list = optional(list(string))
+ display_name = optional(string)
+ description = optional(string, "Terraform-managed")
+ region = string
+ environments = list(string)
+ runtime_ip_cidr_range = string
+ troubleshooting_ip_cidr_range = string
+ disk_encryption_key = optional(string)
+ consumer_accept_list = optional(list(string))
}))
default = null
}
diff --git a/modules/apigee/versions.tf b/modules/apigee/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/apigee/versions.tf
+++ b/modules/apigee/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/artifact-registry/versions.tf b/modules/artifact-registry/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/artifact-registry/versions.tf
+++ b/modules/artifact-registry/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/bigquery-dataset/versions.tf b/modules/bigquery-dataset/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/bigquery-dataset/versions.tf
+++ b/modules/bigquery-dataset/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/bigtable-instance/versions.tf b/modules/bigtable-instance/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/bigtable-instance/versions.tf
+++ b/modules/bigtable-instance/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/billing-budget/versions.tf b/modules/billing-budget/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/billing-budget/versions.tf
+++ b/modules/billing-budget/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/binauthz/versions.tf b/modules/binauthz/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/binauthz/versions.tf
+++ b/modules/binauthz/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/cloud-config-container/__need_fixing/onprem/versions.tf b/modules/cloud-config-container/__need_fixing/onprem/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/cloud-config-container/__need_fixing/onprem/versions.tf
+++ b/modules/cloud-config-container/__need_fixing/onprem/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/cloud-config-container/coredns/versions.tf b/modules/cloud-config-container/coredns/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/cloud-config-container/coredns/versions.tf
+++ b/modules/cloud-config-container/coredns/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/cloud-config-container/cos-generic-metadata/versions.tf b/modules/cloud-config-container/cos-generic-metadata/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/cloud-config-container/cos-generic-metadata/versions.tf
+++ b/modules/cloud-config-container/cos-generic-metadata/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/cloud-config-container/envoy-traffic-director/versions.tf b/modules/cloud-config-container/envoy-traffic-director/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/cloud-config-container/envoy-traffic-director/versions.tf
+++ b/modules/cloud-config-container/envoy-traffic-director/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/cloud-config-container/mysql/versions.tf b/modules/cloud-config-container/mysql/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/cloud-config-container/mysql/versions.tf
+++ b/modules/cloud-config-container/mysql/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/cloud-config-container/nginx-tls/versions.tf b/modules/cloud-config-container/nginx-tls/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/cloud-config-container/nginx-tls/versions.tf
+++ b/modules/cloud-config-container/nginx-tls/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/cloud-config-container/nginx/versions.tf b/modules/cloud-config-container/nginx/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/cloud-config-container/nginx/versions.tf
+++ b/modules/cloud-config-container/nginx/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/cloud-config-container/simple-nva/versions.tf b/modules/cloud-config-container/simple-nva/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/cloud-config-container/simple-nva/versions.tf
+++ b/modules/cloud-config-container/simple-nva/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/cloud-config-container/squid/versions.tf b/modules/cloud-config-container/squid/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/cloud-config-container/squid/versions.tf
+++ b/modules/cloud-config-container/squid/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/cloud-function/versions.tf b/modules/cloud-function/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/cloud-function/versions.tf
+++ b/modules/cloud-function/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/cloud-identity-group/versions.tf b/modules/cloud-identity-group/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/cloud-identity-group/versions.tf
+++ b/modules/cloud-identity-group/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/cloud-run/versions.tf b/modules/cloud-run/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/cloud-run/versions.tf
+++ b/modules/cloud-run/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/cloudsql-instance/versions.tf b/modules/cloudsql-instance/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/cloudsql-instance/versions.tf
+++ b/modules/cloudsql-instance/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/compute-mig/versions.tf b/modules/compute-mig/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/compute-mig/versions.tf
+++ b/modules/compute-mig/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/compute-vm/versions.tf b/modules/compute-vm/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/compute-vm/versions.tf
+++ b/modules/compute-vm/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/container-registry/versions.tf b/modules/container-registry/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/container-registry/versions.tf
+++ b/modules/container-registry/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/data-catalog-policy-tag/versions.tf b/modules/data-catalog-policy-tag/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/data-catalog-policy-tag/versions.tf
+++ b/modules/data-catalog-policy-tag/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/datafusion/versions.tf b/modules/datafusion/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/datafusion/versions.tf
+++ b/modules/datafusion/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/dns/versions.tf b/modules/dns/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/dns/versions.tf
+++ b/modules/dns/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/endpoints/versions.tf b/modules/endpoints/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/endpoints/versions.tf
+++ b/modules/endpoints/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/folder/versions.tf b/modules/folder/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/folder/versions.tf
+++ b/modules/folder/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/gcs/versions.tf b/modules/gcs/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/gcs/versions.tf
+++ b/modules/gcs/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/gke-cluster/README.md b/modules/gke-cluster/README.md
index 0ba75cd6..dabead4f 100644
--- a/modules/gke-cluster/README.md
+++ b/modules/gke-cluster/README.md
@@ -91,38 +91,37 @@ module "cluster-autopilot" {
master_ipv4_cidr_block = "192.168.0.0/28"
}
enable_features = {
- autopilot = true
+ autopilot = true
+ workload_identity = false
}
}
# tftest modules=1 resources=1 inventory=autopilot.yaml
```
-
-
## Variables
| name | description | type | required | default |
|---|---|:---:|:---:|:---:|
-| [location](variables.tf#L117) | Cluster zone or region. | string
| ✓ | |
-| [name](variables.tf#L174) | Cluster name. | string
| ✓ | |
-| [project_id](variables.tf#L200) | Cluster project id. | string
| ✓ | |
-| [vpc_config](variables.tf#L217) | VPC-level configuration. | object({…})
| ✓ | |
+| [location](variables.tf#L118) | Cluster zone or region. | string
| ✓ | |
+| [name](variables.tf#L175) | Cluster name. | string
| ✓ | |
+| [project_id](variables.tf#L201) | Cluster project id. | string
| ✓ | |
+| [vpc_config](variables.tf#L218) | VPC-level configuration. | object({…})
| ✓ | |
| [cluster_autoscaling](variables.tf#L17) | Enable and configure limits for Node Auto-Provisioning with Cluster Autoscaler. | object({…})
| | null
|
| [description](variables.tf#L38) | Cluster description. | string
| | null
|
| [enable_addons](variables.tf#L44) | Addons enabled in the cluster (true means enabled). | object({…})
| | {…}
|
-| [enable_features](variables.tf#L68) | Enable cluster-level features. Certain features allow configuration. | object({…})
| | {…}
|
-| [issue_client_certificate](variables.tf#L105) | Enable issuing client certificate. | bool
| | false
|
-| [labels](variables.tf#L111) | Cluster resource labels. | map(string)
| | null
|
-| [logging_config](variables.tf#L122) | Logging configuration. | list(string)
| | ["SYSTEM_COMPONENTS"]
|
-| [maintenance_config](variables.tf#L128) | Maintenance window configuration. | object({…})
| | {…}
|
-| [max_pods_per_node](variables.tf#L151) | Maximum number of pods per node in this cluster. | number
| | 110
|
-| [min_master_version](variables.tf#L157) | Minimum version of the master, defaults to the version of the most recent official release. | string
| | null
|
-| [monitoring_config](variables.tf#L163) | Monitoring components. | object({…})
| | {…}
|
-| [node_locations](variables.tf#L179) | Zones in which the cluster's nodes are located. | list(string)
| | []
|
-| [private_cluster_config](variables.tf#L186) | Private cluster configuration. | object({…})
| | null
|
-| [release_channel](variables.tf#L205) | Release channel for GKE upgrades. | string
| | null
|
-| [tags](variables.tf#L211) | Network tags applied to nodes. | list(string)
| | null
|
+| [enable_features](variables.tf#L68) | Enable cluster-level features. Certain features allow configuration. | object({…})
| | {…}
|
+| [issue_client_certificate](variables.tf#L106) | Enable issuing client certificate. | bool
| | false
|
+| [labels](variables.tf#L112) | Cluster resource labels. | map(string)
| | null
|
+| [logging_config](variables.tf#L123) | Logging configuration. | list(string)
| | ["SYSTEM_COMPONENTS"]
|
+| [maintenance_config](variables.tf#L129) | Maintenance window configuration. | object({…})
| | {…}
|
+| [max_pods_per_node](variables.tf#L152) | Maximum number of pods per node in this cluster. | number
| | 110
|
+| [min_master_version](variables.tf#L158) | Minimum version of the master, defaults to the version of the most recent official release. | string
| | null
|
+| [monitoring_config](variables.tf#L164) | Monitoring components. | object({…})
| | {…}
|
+| [node_locations](variables.tf#L180) | Zones in which the cluster's nodes are located. | list(string)
| | []
|
+| [private_cluster_config](variables.tf#L187) | Private cluster configuration. | object({…})
| | null
|
+| [release_channel](variables.tf#L206) | Release channel for GKE upgrades. | string
| | null
|
+| [tags](variables.tf#L212) | Network tags applied to nodes. | list(string)
| | null
|
## Outputs
diff --git a/modules/gke-cluster/main.tf b/modules/gke-cluster/main.tf
index d529cb42..f55f46e8 100644
--- a/modules/gke-cluster/main.tf
+++ b/modules/gke-cluster/main.tf
@@ -197,6 +197,13 @@ resource "google_container_cluster" "cluster" {
}
}
+ dynamic "gateway_api_config" {
+ for_each = var.enable_features.gateway_api ? [""] : []
+ content {
+ channel = "CHANNEL_STANDARD"
+ }
+ }
+
maintenance_policy {
dynamic "daily_maintenance_window" {
for_each = (
diff --git a/modules/gke-cluster/variables.tf b/modules/gke-cluster/variables.tf
index 72f7fc14..f02ed504 100644
--- a/modules/gke-cluster/variables.tf
+++ b/modules/gke-cluster/variables.tf
@@ -80,6 +80,7 @@ variable "enable_features" {
key_name = string
}))
dataplane_v2 = optional(bool, false)
+ gateway_api = optional(bool, false)
groups_for_rbac = optional(string)
intranode_visibility = optional(bool, false)
l4_ilb_subsetting = optional(bool, false)
@@ -95,7 +96,7 @@ variable "enable_features" {
topic_id = optional(string)
}))
vertical_pod_autoscaling = optional(bool, false)
- workload_identity = optional(bool, false)
+ workload_identity = optional(bool, true)
})
default = {
workload_identity = true
diff --git a/modules/gke-cluster/versions.tf b/modules/gke-cluster/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/gke-cluster/versions.tf
+++ b/modules/gke-cluster/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/gke-hub/README.md b/modules/gke-hub/README.md
index 17d7b427..6afcd1c8 100644
--- a/modules/gke-hub/README.md
+++ b/modules/gke-hub/README.md
@@ -119,7 +119,7 @@ module "hub" {
}
}
-# tftest modules=4 resources=15
+# tftest modules=4 resources=16
```
## Multi-cluster mesh on GKE
@@ -307,7 +307,7 @@ module "hub" {
| [clusters](variables.tf#L17) | Clusters members of this GKE Hub in name => id format. | map(string)
| | {}
|
| [configmanagement_clusters](variables.tf#L24) | Config management features enabled on specific sets of member clusters, in config name => [cluster name] format. | map(list(string))
| | {}
|
| [configmanagement_templates](variables.tf#L31) | Sets of config management configurations that can be applied to member clusters, in config name => {options} format. | map(object({…}))
| | {}
|
-| [features](variables.tf#L66) | Enable and configue fleet features. | object({…})
| | {…}
|
+| [features](variables.tf#L66) | Enable and configue fleet features. | object({…})
| | {…}
|
| [workload_identity_clusters](variables.tf#L92) | Clusters that will use Fleet Workload Identity. | list(string)
| | []
|
## Outputs
diff --git a/modules/gke-hub/variables.tf b/modules/gke-hub/variables.tf
index c7133c07..25e3d21d 100644
--- a/modules/gke-hub/variables.tf
+++ b/modules/gke-hub/variables.tf
@@ -66,12 +66,12 @@ variable "configmanagement_templates" {
variable "features" {
description = "Enable and configue fleet features."
type = object({
- appdevexperience = bool
- configmanagement = bool
- identityservice = bool
- multiclusteringress = string
- multiclusterservicediscovery = bool
- servicemesh = bool
+ appdevexperience = optional(bool, false)
+ configmanagement = optional(bool, false)
+ identityservice = optional(bool, false)
+ multiclusteringress = optional(string, null)
+ multiclusterservicediscovery = optional(bool, false)
+ servicemesh = optional(bool, false)
})
default = {
appdevexperience = false
diff --git a/modules/gke-hub/versions.tf b/modules/gke-hub/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/gke-hub/versions.tf
+++ b/modules/gke-hub/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/gke-nodepool/versions.tf b/modules/gke-nodepool/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/gke-nodepool/versions.tf
+++ b/modules/gke-nodepool/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/iam-service-account/versions.tf b/modules/iam-service-account/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/iam-service-account/versions.tf
+++ b/modules/iam-service-account/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/kms/versions.tf b/modules/kms/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/kms/versions.tf
+++ b/modules/kms/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/logging-bucket/versions.tf b/modules/logging-bucket/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/logging-bucket/versions.tf
+++ b/modules/logging-bucket/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/net-address/versions.tf b/modules/net-address/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/net-address/versions.tf
+++ b/modules/net-address/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/net-cloudnat/versions.tf b/modules/net-cloudnat/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/net-cloudnat/versions.tf
+++ b/modules/net-cloudnat/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/net-glb/versions.tf b/modules/net-glb/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/net-glb/versions.tf
+++ b/modules/net-glb/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/net-ilb-l7/versions.tf b/modules/net-ilb-l7/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/net-ilb-l7/versions.tf
+++ b/modules/net-ilb-l7/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/net-ilb/versions.tf b/modules/net-ilb/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/net-ilb/versions.tf
+++ b/modules/net-ilb/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/net-interconnect-attachment-direct/versions.tf b/modules/net-interconnect-attachment-direct/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/net-interconnect-attachment-direct/versions.tf
+++ b/modules/net-interconnect-attachment-direct/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/net-vpc-firewall/versions.tf b/modules/net-vpc-firewall/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/net-vpc-firewall/versions.tf
+++ b/modules/net-vpc-firewall/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/net-vpc-peering/versions.tf b/modules/net-vpc-peering/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/net-vpc-peering/versions.tf
+++ b/modules/net-vpc-peering/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/net-vpc/versions.tf b/modules/net-vpc/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/net-vpc/versions.tf
+++ b/modules/net-vpc/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/net-vpn-dynamic/versions.tf b/modules/net-vpn-dynamic/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/net-vpn-dynamic/versions.tf
+++ b/modules/net-vpn-dynamic/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/net-vpn-ha/versions.tf b/modules/net-vpn-ha/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/net-vpn-ha/versions.tf
+++ b/modules/net-vpn-ha/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/net-vpn-static/versions.tf b/modules/net-vpn-static/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/net-vpn-static/versions.tf
+++ b/modules/net-vpn-static/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/organization/versions.tf b/modules/organization/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/organization/versions.tf
+++ b/modules/organization/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/project/service-accounts.tf b/modules/project/service-accounts.tf
index b25c6126..1979958b 100644
--- a/modules/project/service-accounts.tf
+++ b/modules/project/service-accounts.tf
@@ -45,6 +45,8 @@ locals {
# TODO: jit?
gke-mcs = "service-%s@gcp-sa-mcsd"
monitoring-notifications = "service-%s@gcp-sa-monitoring-notification"
+ multicluster-ingress = "service-%s@gcp-sa-multiclusteringress"
+ multicluster-discovery = "service-%s@gcp-sa-mcsd"
notebooks = "service-%s@gcp-sa-notebooks"
pubsub = "service-%s@gcp-sa-pubsub"
secretmanager = "service-%s@gcp-sa-secretmanager"
@@ -73,6 +75,7 @@ locals {
"artifactregistry.googleapis.com",
"cloudasset.googleapis.com",
"gkehub.googleapis.com",
+ "multiclusteringress.googleapis.com",
"pubsub.googleapis.com",
"secretmanager.googleapis.com",
"sqladmin.googleapis.com",
diff --git a/modules/project/versions.tf b/modules/project/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/project/versions.tf
+++ b/modules/project/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/projects-data-source/versions.tf b/modules/projects-data-source/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/projects-data-source/versions.tf
+++ b/modules/projects-data-source/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/pubsub/versions.tf b/modules/pubsub/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/pubsub/versions.tf
+++ b/modules/pubsub/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/secret-manager/versions.tf b/modules/secret-manager/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/secret-manager/versions.tf
+++ b/modules/secret-manager/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/service-directory/versions.tf b/modules/service-directory/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/service-directory/versions.tf
+++ b/modules/service-directory/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/source-repository/versions.tf b/modules/source-repository/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/source-repository/versions.tf
+++ b/modules/source-repository/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/modules/vpc-sc/versions.tf b/modules/vpc-sc/versions.tf
index 90b632f6..4900174a 100644
--- a/modules/vpc-sc/versions.tf
+++ b/modules/vpc-sc/versions.tf
@@ -17,11 +17,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
- version = ">= 4.47.0" # tftest
+ version = ">= 4.48.0" # tftest
}
}
}
diff --git a/tests/blueprints/apigee/bigquery-analytics/basic.tfvars b/tests/blueprints/apigee/bigquery-analytics/basic.tfvars
index 8a650b56..2f9315a4 100644
--- a/tests/blueprints/apigee/bigquery-analytics/basic.tfvars
+++ b/tests/blueprints/apigee/bigquery-analytics/basic.tfvars
@@ -13,9 +13,10 @@ environments = {
}
instances = {
instance-ew1 = {
- region = "europe-west1"
- environments = ["apis-test"]
- psa_ip_cidr_range = "10.0.4.0/22"
+ region = "europe-west1"
+ environments = ["apis-test"]
+ runtime_ip_cidr_range = "10.0.4.0/22"
+ troubleshooting_ip_cidr_range = "10.1.0.0/28"
}
}
psc_config = {
diff --git a/tests/blueprints/apigee/bigquery-analytics/basic.yaml b/tests/blueprints/apigee/bigquery-analytics/basic.yaml
index d89eaef5..691af456 100644
--- a/tests/blueprints/apigee/bigquery-analytics/basic.yaml
+++ b/tests/blueprints/apigee/bigquery-analytics/basic.yaml
@@ -14,4 +14,4 @@
counts:
modules: 9
- resources: 61
+ resources: 62
diff --git a/tests/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/basic.yaml b/tests/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/basic.yaml
index ef1fa1e0..de461ff2 100644
--- a/tests/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/basic.yaml
+++ b/tests/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/basic.yaml
@@ -14,4 +14,4 @@
counts:
modules: 13
- resources: 72
+ resources: 73
diff --git a/tests/blueprints/gke/multitenant_fleet/test_plan.py b/tests/blueprints/gke/multitenant_fleet/test_plan.py
index 2b94b766..c8a83694 100644
--- a/tests/blueprints/gke/multitenant_fleet/test_plan.py
+++ b/tests/blueprints/gke/multitenant_fleet/test_plan.py
@@ -17,4 +17,4 @@ def test_resources(e2e_plan_runner):
"Test that plan works and the numbers of resources is as expected."
modules, resources = e2e_plan_runner()
assert len(modules) == 4
- assert len(resources) == 22
+ assert len(resources) == 23
diff --git a/tests/modules/apigee/fixture/test.all.tfvars b/tests/modules/apigee/fixture/test.all.tfvars
index d0c29921..9eb337b7 100644
--- a/tests/modules/apigee/fixture/test.all.tfvars
+++ b/tests/modules/apigee/fixture/test.all.tfvars
@@ -29,14 +29,16 @@ environments = {
}
instances = {
instance-test-ew1 = {
- region = "europe-west1"
- environments = ["apis-test"]
- psa_ip_cidr_range = "10.0.4.0/22"
+ region = "europe-west1"
+ environments = ["apis-test"]
+ runtime_ip_cidr_range = "10.0.4.0/22"
+ troubleshooting_ip_cidr_range = "10.1.0.0/28"
}
instance-prod-ew3 = {
- region = "europe-west3"
- environments = ["apis-prod"]
- psa_ip_cidr_range = "10.0.5.0/22"
+ region = "europe-west3"
+ environments = ["apis-prod"]
+ runtime_ip_cidr_range = "10.0.6.0/22"
+ troubleshooting_ip_cidr_range = "10.1.0.16/28"
}
}
endpoint_attachments = {
diff --git a/tests/modules/apigee/fixture/test.instance_only.tfvars b/tests/modules/apigee/fixture/test.instance_only.tfvars
index 3d3eb1be..d9399bfa 100644
--- a/tests/modules/apigee/fixture/test.instance_only.tfvars
+++ b/tests/modules/apigee/fixture/test.instance_only.tfvars
@@ -1,8 +1,9 @@
project_id = "my-project"
instances = {
instance-test-ew1 = {
- region = "europe-west1"
- environments = ["apis-test"]
- psa_ip_cidr_range = "10.0.4.0/22"
+ region = "europe-west1"
+ environments = ["apis-test"]
+ runtime_ip_cidr_range = "10.0.4.0/22"
+ troubleshooting_ip_cidr_range = "10.1.1.0.0/28"
}
-}
\ No newline at end of file
+}
diff --git a/tests/modules/apigee/fixture/variables.tf b/tests/modules/apigee/fixture/variables.tf
index 81cf77f6..00961aac 100644
--- a/tests/modules/apigee/fixture/variables.tf
+++ b/tests/modules/apigee/fixture/variables.tf
@@ -49,13 +49,14 @@ variable "environments" {
variable "instances" {
description = "Instances."
type = map(object({
- display_name = optional(string)
- description = optional(string, "Terraform-managed")
- region = string
- environments = list(string)
- psa_ip_cidr_range = string
- disk_encryption_key = optional(string)
- consumer_accept_list = optional(list(string))
+ display_name = optional(string)
+ description = optional(string, "Terraform-managed")
+ region = string
+ environments = list(string)
+ runtime_ip_cidr_range = string
+ troubleshooting_ip_cidr_range = string
+ disk_encryption_key = optional(string)
+ consumer_accept_list = optional(list(string))
}))
default = null
}
diff --git a/tests/modules/gke_hub/test_plan.py b/tests/modules/gke_hub/test_plan.py
index 51258c83..8a71d12b 100644
--- a/tests/modules/gke_hub/test_plan.py
+++ b/tests/modules/gke_hub/test_plan.py
@@ -61,6 +61,7 @@ def test_configmanagement_setup(resources):
'sync_wait_secs':
None
}],
+ 'oci': [],
'prevent_drift': False,
'source_format': 'hierarchy'
}],
diff --git a/tests/modules/gke_nodepool/examples/config.yaml b/tests/modules/gke_nodepool/examples/config.yaml
index fc1682a8..858e5ca5 100644
--- a/tests/modules/gke_nodepool/examples/config.yaml
+++ b/tests/modules/gke_nodepool/examples/config.yaml
@@ -15,8 +15,7 @@
values:
module.cluster-1-nodepool-1.google_container_node_pool.nodepool:
autoscaling:
- - location_policy: null
- max_node_count: 10
+ - max_node_count: 10
min_node_count: 1
total_max_node_count: null
total_min_node_count: null