From 10e3184451c0aeefcd047c44e42e4e5e3eda6f7e Mon Sep 17 00:00:00 2001 From: Eunan Hardy Date: Mon, 7 Aug 2023 12:44:59 +0100 Subject: [PATCH 1/6] Expose allow_net_admin feature in gke-cluster-autopilot --- modules/gke-cluster-autopilot/main.tf | 1 + modules/gke-cluster-autopilot/variables.tf | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/modules/gke-cluster-autopilot/main.tf b/modules/gke-cluster-autopilot/main.tf index 7b51b56a6f..450260a8be 100644 --- a/modules/gke-cluster-autopilot/main.tf +++ b/modules/gke-cluster-autopilot/main.tf @@ -32,6 +32,7 @@ resource "google_container_cluster" "cluster" { initial_node_count = 1 enable_autopilot = true + allow_net_admin = var.allow_net_admin addons_config { http_load_balancing { diff --git a/modules/gke-cluster-autopilot/variables.tf b/modules/gke-cluster-autopilot/variables.tf index 60350366c8..9f7395efc8 100644 --- a/modules/gke-cluster-autopilot/variables.tf +++ b/modules/gke-cluster-autopilot/variables.tf @@ -211,3 +211,9 @@ variable "vpc_config" { }) nullable = false } + +variable "allow_net_admin" { + description = "Enable NET_ADMIN feature on autopilot cluster." + type = bool + default = false +} From 69ea9dd3bea89bfb8e338bb5f90ba36bef9ca5f5 Mon Sep 17 00:00:00 2001 From: Eunan Hardy Date: Mon, 7 Aug 2023 12:46:54 +0100 Subject: [PATCH 2/6] Linting with terraform fmt --- modules/gke-cluster-autopilot/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gke-cluster-autopilot/main.tf b/modules/gke-cluster-autopilot/main.tf index 450260a8be..eac6ebeb7e 100644 --- a/modules/gke-cluster-autopilot/main.tf +++ b/modules/gke-cluster-autopilot/main.tf @@ -32,7 +32,7 @@ resource "google_container_cluster" "cluster" { initial_node_count = 1 enable_autopilot = true - allow_net_admin = var.allow_net_admin + allow_net_admin = var.allow_net_admin addons_config { http_load_balancing { From dd3a298892f9267ec62c690ae1462f49610b583e Mon Sep 17 00:00:00 2001 From: Eunan Hardy Date: Mon, 7 Aug 2023 14:27:20 +0100 Subject: [PATCH 3/6] Moved allow_net_admin to enable_features flag. Bumped provider version to 4.76 --- blueprints/apigee/bigquery-analytics/versions.tf | 4 ++-- .../nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/versions.tf | 4 ++-- blueprints/cloud-operations/adfs/versions.tf | 4 ++-- .../asset-inventory-feed-remediation/versions.tf | 4 ++-- .../cloud-operations/dns-fine-grained-iam/versions.tf | 4 ++-- blueprints/cloud-operations/dns-shared-vpc/versions.tf | 4 ++-- .../cloud-operations/iam-delegated-role-grants/versions.tf | 4 ++-- .../cloud-operations/onprem-sa-key-management/versions.tf | 4 ++-- .../cloud-operations/packer-image-builder/versions.tf | 4 ++-- blueprints/cloud-operations/quota-monitoring/versions.tf | 4 ++-- .../scheduled-asset-inventory-export-bq/versions.tf | 4 ++-- blueprints/data-solutions/bq-ml/versions.tf | 4 ++-- .../data-solutions/cmek-via-centralized-kms/versions.tf | 4 ++-- blueprints/data-solutions/data-playground/versions.tf | 4 ++-- .../gcs-to-bq-with-least-privileges/versions.tf | 4 ++-- blueprints/factories/net-vpc-firewall-yaml/versions.tf | 4 ++-- .../__need_fixing/nginx-reverse-proxy-cluster/versions.tf | 4 ++-- .../__need_fixing/onprem-google-access-dns/versions.tf | 4 ++-- blueprints/networking/decentralized-firewall/versions.tf | 4 ++-- blueprints/networking/filtering-proxy-psc/versions.tf | 4 ++-- blueprints/networking/filtering-proxy/versions.tf | 4 ++-- blueprints/networking/hub-and-spoke-peering/versions.tf | 4 ++-- blueprints/networking/hub-and-spoke-vpn/versions.tf | 4 ++-- blueprints/networking/ilb-next-hop/versions.tf | 4 ++-- .../private-cloud-function-from-onprem/versions.tf | 4 ++-- blueprints/networking/shared-vpc-gke/versions.tf | 4 ++-- blueprints/third-party-solutions/openshift/tf/versions.tf | 4 ++-- default-versions.tf | 4 ++-- modules/__experimental/net-neg/versions.tf | 4 ++-- modules/alloydb-instance/versions.tf | 4 ++-- modules/api-gateway/versions.tf | 4 ++-- modules/apigee/versions.tf | 4 ++-- modules/artifact-registry/versions.tf | 4 ++-- modules/bigquery-dataset/versions.tf | 4 ++-- modules/bigtable-instance/versions.tf | 4 ++-- modules/billing-budget/versions.tf | 4 ++-- modules/binauthz/versions.tf | 4 ++-- .../__need_fixing/onprem/versions.tf | 4 ++-- modules/cloud-config-container/coredns/versions.tf | 4 ++-- .../cos-generic-metadata/versions.tf | 4 ++-- .../envoy-traffic-director/versions.tf | 4 ++-- modules/cloud-config-container/mysql/versions.tf | 4 ++-- modules/cloud-config-container/nginx-tls/versions.tf | 4 ++-- modules/cloud-config-container/nginx/versions.tf | 4 ++-- modules/cloud-config-container/simple-nva/versions.tf | 4 ++-- modules/cloud-config-container/squid/versions.tf | 4 ++-- modules/cloud-function-v1/versions.tf | 4 ++-- modules/cloud-function-v2/versions.tf | 4 ++-- modules/cloud-identity-group/versions.tf | 4 ++-- modules/cloud-run/versions.tf | 4 ++-- modules/cloudsql-instance/versions.tf | 4 ++-- modules/compute-mig/versions.tf | 4 ++-- modules/compute-vm/versions.tf | 4 ++-- modules/container-registry/versions.tf | 4 ++-- modules/data-catalog-policy-tag/versions.tf | 4 ++-- modules/datafusion/versions.tf | 4 ++-- modules/dataplex-datascan/versions.tf | 6 ++++-- modules/dataplex/versions.tf | 4 ++-- modules/dataproc/versions.tf | 4 ++-- modules/dns-response-policy/versions.tf | 4 ++-- modules/dns/versions.tf | 4 ++-- modules/endpoints/versions.tf | 4 ++-- modules/folder/versions.tf | 4 ++-- modules/gcs/versions.tf | 4 ++-- modules/gke-cluster-autopilot/main.tf | 2 +- modules/gke-cluster-autopilot/variables.tf | 7 +------ modules/gke-cluster-autopilot/versions.tf | 4 ++-- modules/gke-cluster-standard/versions.tf | 4 ++-- modules/gke-hub/versions.tf | 4 ++-- modules/gke-nodepool/versions.tf | 4 ++-- modules/iam-service-account/versions.tf | 4 ++-- modules/kms/versions.tf | 4 ++-- modules/logging-bucket/versions.tf | 4 ++-- modules/ncc-spoke-ra/versions.tf | 4 ++-- modules/net-address/versions.tf | 4 ++-- modules/net-cloudnat/versions.tf | 4 ++-- modules/net-ipsec-over-interconnect/versions.tf | 4 ++-- modules/net-lb-app-ext/versions.tf | 4 ++-- modules/net-lb-app-int/versions.tf | 4 ++-- modules/net-lb-ext/versions.tf | 4 ++-- modules/net-lb-int/versions.tf | 4 ++-- modules/net-lb-proxy-int/versions.tf | 4 ++-- modules/net-swp/versions.tf | 4 ++-- modules/net-vlan-attachment/versions.tf | 4 ++-- modules/net-vpc-firewall-policy/versions.tf | 4 ++-- modules/net-vpc-firewall/versions.tf | 4 ++-- modules/net-vpc-peering/versions.tf | 4 ++-- modules/net-vpc/versions.tf | 4 ++-- modules/net-vpn-dynamic/versions.tf | 4 ++-- modules/net-vpn-ha/versions.tf | 4 ++-- modules/net-vpn-static/versions.tf | 4 ++-- modules/organization/versions.tf | 4 ++-- modules/project/versions.tf | 4 ++-- modules/projects-data-source/versions.tf | 4 ++-- modules/pubsub/versions.tf | 4 ++-- modules/secret-manager/versions.tf | 4 ++-- modules/service-directory/versions.tf | 4 ++-- modules/source-repository/versions.tf | 4 ++-- modules/vpc-sc/versions.tf | 4 ++-- 99 files changed, 198 insertions(+), 201 deletions(-) diff --git a/blueprints/apigee/bigquery-analytics/versions.tf b/blueprints/apigee/bigquery-analytics/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } 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 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/blueprints/cloud-operations/adfs/versions.tf b/blueprints/cloud-operations/adfs/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.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 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.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 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/blueprints/cloud-operations/dns-shared-vpc/versions.tf b/blueprints/cloud-operations/dns-shared-vpc/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.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 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.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 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/blueprints/cloud-operations/packer-image-builder/versions.tf b/blueprints/cloud-operations/packer-image-builder/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/blueprints/cloud-operations/quota-monitoring/versions.tf b/blueprints/cloud-operations/quota-monitoring/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.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 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/blueprints/data-solutions/bq-ml/versions.tf b/blueprints/data-solutions/bq-ml/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/blueprints/data-solutions/bq-ml/versions.tf +++ b/blueprints/data-solutions/bq-ml/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.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 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/blueprints/data-solutions/data-playground/versions.tf b/blueprints/data-solutions/data-playground/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.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 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/blueprints/factories/net-vpc-firewall-yaml/versions.tf b/blueprints/factories/net-vpc-firewall-yaml/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } 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 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.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 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/blueprints/networking/decentralized-firewall/versions.tf b/blueprints/networking/decentralized-firewall/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/blueprints/networking/filtering-proxy-psc/versions.tf b/blueprints/networking/filtering-proxy-psc/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/blueprints/networking/filtering-proxy/versions.tf b/blueprints/networking/filtering-proxy/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/blueprints/networking/hub-and-spoke-peering/versions.tf b/blueprints/networking/hub-and-spoke-peering/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/blueprints/networking/hub-and-spoke-vpn/versions.tf b/blueprints/networking/hub-and-spoke-vpn/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/blueprints/networking/ilb-next-hop/versions.tf b/blueprints/networking/ilb-next-hop/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.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 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/blueprints/networking/shared-vpc-gke/versions.tf b/blueprints/networking/shared-vpc-gke/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/blueprints/third-party-solutions/openshift/tf/versions.tf b/blueprints/third-party-solutions/openshift/tf/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/default-versions.tf b/default-versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/default-versions.tf +++ b/default-versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/__experimental/net-neg/versions.tf b/modules/__experimental/net-neg/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/alloydb-instance/versions.tf b/modules/alloydb-instance/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/alloydb-instance/versions.tf +++ b/modules/alloydb-instance/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/api-gateway/versions.tf b/modules/api-gateway/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/apigee/versions.tf b/modules/apigee/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/apigee/versions.tf +++ b/modules/apigee/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/artifact-registry/versions.tf b/modules/artifact-registry/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/bigquery-dataset/versions.tf b/modules/bigquery-dataset/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/bigtable-instance/versions.tf b/modules/bigtable-instance/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/billing-budget/versions.tf b/modules/billing-budget/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/binauthz/versions.tf b/modules/binauthz/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/binauthz/versions.tf +++ b/modules/binauthz/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.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 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/cloud-config-container/coredns/versions.tf b/modules/cloud-config-container/coredns/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.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 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.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 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/cloud-config-container/mysql/versions.tf b/modules/cloud-config-container/mysql/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/cloud-config-container/nginx-tls/versions.tf b/modules/cloud-config-container/nginx-tls/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/cloud-config-container/nginx/versions.tf b/modules/cloud-config-container/nginx/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/cloud-config-container/simple-nva/versions.tf b/modules/cloud-config-container/simple-nva/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/cloud-config-container/squid/versions.tf b/modules/cloud-config-container/squid/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/cloud-function-v1/versions.tf b/modules/cloud-function-v1/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/cloud-function-v1/versions.tf +++ b/modules/cloud-function-v1/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/cloud-function-v2/versions.tf b/modules/cloud-function-v2/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/cloud-function-v2/versions.tf +++ b/modules/cloud-function-v2/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/cloud-identity-group/versions.tf b/modules/cloud-identity-group/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/cloud-run/versions.tf b/modules/cloud-run/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/cloudsql-instance/versions.tf b/modules/cloudsql-instance/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/compute-mig/versions.tf b/modules/compute-mig/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/compute-vm/versions.tf b/modules/compute-vm/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/container-registry/versions.tf b/modules/container-registry/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/data-catalog-policy-tag/versions.tf b/modules/data-catalog-policy-tag/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/datafusion/versions.tf b/modules/datafusion/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/datafusion/versions.tf +++ b/modules/datafusion/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/dataplex-datascan/versions.tf b/modules/dataplex-datascan/versions.tf index 6c58508757..8ff3fc42ff 100644 --- a/modules/dataplex-datascan/versions.tf +++ b/modules/dataplex-datascan/versions.tf @@ -17,11 +17,13 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } + + diff --git a/modules/dataplex/versions.tf b/modules/dataplex/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/dataplex/versions.tf +++ b/modules/dataplex/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/dataproc/versions.tf b/modules/dataproc/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/dataproc/versions.tf +++ b/modules/dataproc/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/dns-response-policy/versions.tf b/modules/dns-response-policy/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/dns-response-policy/versions.tf +++ b/modules/dns-response-policy/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/dns/versions.tf b/modules/dns/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/dns/versions.tf +++ b/modules/dns/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/endpoints/versions.tf b/modules/endpoints/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/endpoints/versions.tf +++ b/modules/endpoints/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/folder/versions.tf b/modules/folder/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/folder/versions.tf +++ b/modules/folder/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/gcs/versions.tf b/modules/gcs/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/gcs/versions.tf +++ b/modules/gcs/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/gke-cluster-autopilot/main.tf b/modules/gke-cluster-autopilot/main.tf index eac6ebeb7e..40cd74e077 100644 --- a/modules/gke-cluster-autopilot/main.tf +++ b/modules/gke-cluster-autopilot/main.tf @@ -32,7 +32,7 @@ resource "google_container_cluster" "cluster" { initial_node_count = 1 enable_autopilot = true - allow_net_admin = var.allow_net_admin + allow_net_admin = var.enable_features.allow_net_admin addons_config { http_load_balancing { diff --git a/modules/gke-cluster-autopilot/variables.tf b/modules/gke-cluster-autopilot/variables.tf index 9f7395efc8..c3bd9fa6aa 100644 --- a/modules/gke-cluster-autopilot/variables.tf +++ b/modules/gke-cluster-autopilot/variables.tf @@ -80,6 +80,7 @@ variable "enable_features" { l4_ilb_subsetting = optional(bool, false) mesh_certificates = optional(bool) pod_security_policy = optional(bool, false) + allow_net_admin = optional(bool, false) resource_usage_export = optional(object({ dataset = string enable_network_egress_metering = optional(bool) @@ -211,9 +212,3 @@ variable "vpc_config" { }) nullable = false } - -variable "allow_net_admin" { - description = "Enable NET_ADMIN feature on autopilot cluster." - type = bool - default = false -} diff --git a/modules/gke-cluster-autopilot/versions.tf b/modules/gke-cluster-autopilot/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/gke-cluster-autopilot/versions.tf +++ b/modules/gke-cluster-autopilot/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/gke-cluster-standard/versions.tf b/modules/gke-cluster-standard/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/gke-cluster-standard/versions.tf +++ b/modules/gke-cluster-standard/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/gke-hub/versions.tf b/modules/gke-hub/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/gke-nodepool/versions.tf b/modules/gke-nodepool/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/iam-service-account/versions.tf b/modules/iam-service-account/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/kms/versions.tf b/modules/kms/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/kms/versions.tf +++ b/modules/kms/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/logging-bucket/versions.tf b/modules/logging-bucket/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/ncc-spoke-ra/versions.tf b/modules/ncc-spoke-ra/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/ncc-spoke-ra/versions.tf +++ b/modules/ncc-spoke-ra/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/net-address/versions.tf b/modules/net-address/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/net-cloudnat/versions.tf b/modules/net-cloudnat/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/net-ipsec-over-interconnect/versions.tf b/modules/net-ipsec-over-interconnect/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/net-ipsec-over-interconnect/versions.tf +++ b/modules/net-ipsec-over-interconnect/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/net-lb-app-ext/versions.tf b/modules/net-lb-app-ext/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/net-lb-app-ext/versions.tf +++ b/modules/net-lb-app-ext/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/net-lb-app-int/versions.tf b/modules/net-lb-app-int/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/net-lb-app-int/versions.tf +++ b/modules/net-lb-app-int/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/net-lb-ext/versions.tf b/modules/net-lb-ext/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/net-lb-ext/versions.tf +++ b/modules/net-lb-ext/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/net-lb-int/versions.tf b/modules/net-lb-int/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/net-lb-int/versions.tf +++ b/modules/net-lb-int/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/net-lb-proxy-int/versions.tf b/modules/net-lb-proxy-int/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/net-lb-proxy-int/versions.tf +++ b/modules/net-lb-proxy-int/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/net-swp/versions.tf b/modules/net-swp/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/net-swp/versions.tf +++ b/modules/net-swp/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/net-vlan-attachment/versions.tf b/modules/net-vlan-attachment/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/net-vlan-attachment/versions.tf +++ b/modules/net-vlan-attachment/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/net-vpc-firewall-policy/versions.tf b/modules/net-vpc-firewall-policy/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/net-vpc-firewall-policy/versions.tf +++ b/modules/net-vpc-firewall-policy/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/net-vpc-firewall/versions.tf b/modules/net-vpc-firewall/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/net-vpc-peering/versions.tf b/modules/net-vpc-peering/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/net-vpc/versions.tf b/modules/net-vpc/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/net-vpn-dynamic/versions.tf b/modules/net-vpn-dynamic/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/net-vpn-ha/versions.tf b/modules/net-vpn-ha/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/net-vpn-static/versions.tf b/modules/net-vpn-static/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/organization/versions.tf b/modules/organization/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/organization/versions.tf +++ b/modules/organization/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/project/versions.tf b/modules/project/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/project/versions.tf +++ b/modules/project/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/projects-data-source/versions.tf b/modules/projects-data-source/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/pubsub/versions.tf b/modules/pubsub/versions.tf index 2ce9578209..8ff3fc42ff 100644 --- a/modules/pubsub/versions.tf +++ b/modules/pubsub/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/secret-manager/versions.tf b/modules/secret-manager/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/service-directory/versions.tf b/modules/service-directory/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/source-repository/versions.tf b/modules/source-repository/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } diff --git a/modules/vpc-sc/versions.tf b/modules/vpc-sc/versions.tf index 2ce9578209..8ff3fc42ff 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.71.0" # tftest + version = ">= 4.76.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.71.0" # tftest + version = ">= 4.76.0" # tftest } } } From 9ec38581d7e11fb595862446059e2b7e404af02f Mon Sep 17 00:00:00 2001 From: Eunan Hardy Date: Mon, 7 Aug 2023 14:33:54 +0100 Subject: [PATCH 4/6] Update README.md --- modules/gke-cluster-autopilot/README.md | 28 ++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/gke-cluster-autopilot/README.md b/modules/gke-cluster-autopilot/README.md index 281a15df47..3c019162d9 100644 --- a/modules/gke-cluster-autopilot/README.md +++ b/modules/gke-cluster-autopilot/README.md @@ -95,23 +95,23 @@ module "cluster-1" { | name | description | type | required | default | |---|---|:---:|:---:|:---:| -| [location](variables.tf#L111) | Autopilot cluster are always regional. | string | ✓ | | -| [name](variables.tf#L146) | Cluster name. | string | ✓ | | -| [project_id](variables.tf#L172) | Cluster project id. | string | ✓ | | -| [vpc_config](variables.tf#L195) | VPC-level configuration. | object({…}) | ✓ | | +| [location](variables.tf#L112) | Autopilot cluster are always regional. | string | ✓ | | +| [name](variables.tf#L147) | Cluster name. | string | ✓ | | +| [project_id](variables.tf#L173) | Cluster project id. | string | ✓ | | +| [vpc_config](variables.tf#L196) | VPC-level configuration. | object({…}) | ✓ | | | [backup_configs](variables.tf#L17) | Configuration for Backup for GKE. | object({…}) | | {} | | [description](variables.tf#L37) | Cluster description. | string | | null | | [enable_addons](variables.tf#L43) | Addons enabled in the cluster (true means enabled). | object({…}) | | {…} | -| [enable_features](variables.tf#L64) | Enable cluster-level features. Certain features allow configuration. | object({…}) | | {…} | -| [issue_client_certificate](variables.tf#L99) | Enable issuing client certificate. | bool | | false | -| [labels](variables.tf#L105) | Cluster resource labels. | map(string) | | null | -| [maintenance_config](variables.tf#L117) | Maintenance window configuration. | object({…}) | | {…} | -| [min_master_version](variables.tf#L140) | Minimum version of the master, defaults to the version of the most recent official release. | string | | null | -| [node_locations](variables.tf#L151) | Zones in which the cluster's nodes are located. | list(string) | | [] | -| [private_cluster_config](variables.tf#L158) | Private cluster configuration. | object({…}) | | null | -| [release_channel](variables.tf#L177) | Release channel for GKE upgrades. | string | | null | -| [service_account](variables.tf#L183) | The Google Cloud Platform Service Account to be used by the node VMs created by GKE Autopilot. | string | | null | -| [tags](variables.tf#L189) | Network tags applied to nodes. | list(string) | | null | +| [enable_features](variables.tf#L64) | Enable cluster-level features. Certain features allow configuration. | object({…}) | | {…} | +| [issue_client_certificate](variables.tf#L100) | Enable issuing client certificate. | bool | | false | +| [labels](variables.tf#L106) | Cluster resource labels. | map(string) | | null | +| [maintenance_config](variables.tf#L118) | Maintenance window configuration. | object({…}) | | {…} | +| [min_master_version](variables.tf#L141) | Minimum version of the master, defaults to the version of the most recent official release. | string | | null | +| [node_locations](variables.tf#L152) | Zones in which the cluster's nodes are located. | list(string) | | [] | +| [private_cluster_config](variables.tf#L159) | Private cluster configuration. | object({…}) | | null | +| [release_channel](variables.tf#L178) | Release channel for GKE upgrades. | string | | null | +| [service_account](variables.tf#L184) | The Google Cloud Platform Service Account to be used by the node VMs created by GKE Autopilot. | string | | null | +| [tags](variables.tf#L190) | Network tags applied to nodes. | list(string) | | null | ## Outputs From 42fdd08411141ccba411f1e6941466bb7d6038b8 Mon Sep 17 00:00:00 2001 From: Julio Castillo Date: Mon, 7 Aug 2023 16:23:10 +0200 Subject: [PATCH 5/6] Fix cloud sql tests --- tests/modules/cloudsql_instance/examples/insights.yaml | 2 ++ tests/modules/cloudsql_instance/examples/public-ip.yaml | 4 ++++ tests/modules/cloudsql_instance/examples/simple.yaml | 2 ++ 3 files changed, 8 insertions(+) diff --git a/tests/modules/cloudsql_instance/examples/insights.yaml b/tests/modules/cloudsql_instance/examples/insights.yaml index b861c3ea74..73cd19d93c 100644 --- a/tests/modules/cloudsql_instance/examples/insights.yaml +++ b/tests/modules/cloudsql_instance/examples/insights.yaml @@ -24,12 +24,14 @@ values: advanced_machine_features: [] availability_type: ZONAL collation: null + data_cache_config: [] database_flags: [] deletion_protection_enabled: null deny_maintenance_period: [] disk_autoresize: true disk_autoresize_limit: 0 disk_type: PD_SSD + edition: null insights_config: - query_insights_enabled: true query_plans_per_minute: 5 diff --git a/tests/modules/cloudsql_instance/examples/public-ip.yaml b/tests/modules/cloudsql_instance/examples/public-ip.yaml index 6e85f62336..531a5cbc22 100644 --- a/tests/modules/cloudsql_instance/examples/public-ip.yaml +++ b/tests/modules/cloudsql_instance/examples/public-ip.yaml @@ -35,12 +35,14 @@ values: start_time: '23:00' transaction_log_retention_days: 7 collation: null + data_cache_config: [] database_flags: [] deletion_protection_enabled: null deny_maintenance_period: [] disk_autoresize: true disk_autoresize_limit: 0 disk_type: PD_SSD + edition: null insights_config: [] ip_configuration: - allocated_ip_range: null @@ -67,12 +69,14 @@ values: advanced_machine_features: [] availability_type: ZONAL collation: null + data_cache_config: [] database_flags: [] deletion_protection_enabled: null deny_maintenance_period: [] disk_autoresize: true disk_autoresize_limit: 0 disk_type: PD_SSD + edition: null insights_config: [] ip_configuration: - allocated_ip_range: null diff --git a/tests/modules/cloudsql_instance/examples/simple.yaml b/tests/modules/cloudsql_instance/examples/simple.yaml index 4c138a9d94..7690dc09c6 100644 --- a/tests/modules/cloudsql_instance/examples/simple.yaml +++ b/tests/modules/cloudsql_instance/examples/simple.yaml @@ -25,12 +25,14 @@ values: advanced_machine_features: [] availability_type: ZONAL collation: null + data_cache_config: [] database_flags: [] deletion_protection_enabled: null deny_maintenance_period: [] disk_autoresize: true disk_autoresize_limit: 0 disk_type: PD_SSD + edition: null insights_config: [] ip_configuration: - allocated_ip_range: null From 959012e93e265b954e227da273a757b5f627cee7 Mon Sep 17 00:00:00 2001 From: Julio Castillo Date: Mon, 7 Aug 2023 16:46:20 +0200 Subject: [PATCH 6/6] Fix cloud run tests --- .../modules/cloud_run/examples/connector-shared.yaml | 4 +--- tests/modules/cloud_run/examples/connector.yaml | 4 +++- .../cloud_run/examples/revision-annotations.yaml | 11 ++++++----- tests/modules/cloud_run/examples/secrets.yaml | 8 +++++++- .../cloud_run/examples/service-account-external.yaml | 8 +++++++- tests/modules/cloud_run/examples/service-account.yaml | 5 ++++- tests/modules/cloud_run/examples/simple.yaml | 4 +++- 7 files changed, 31 insertions(+), 13 deletions(-) diff --git a/tests/modules/cloud_run/examples/connector-shared.yaml b/tests/modules/cloud_run/examples/connector-shared.yaml index 4db0a3bcc6..05b3fc0104 100644 --- a/tests/modules/cloud_run/examples/connector-shared.yaml +++ b/tests/modules/cloud_run/examples/connector-shared.yaml @@ -22,7 +22,7 @@ values: project: project-id template: - metadata: - - labels: null + - {} spec: - containers: - args: null @@ -34,7 +34,6 @@ values: volume_mounts: [] working_dir: null volumes: [] - timeouts: null module.cloud_run.google_vpc_access_connector.connector[0]: ip_cidr_range: null machine_type: e2-micro @@ -46,7 +45,6 @@ values: subnet: - name: subnet-vpc-access project_id: host-project - timeouts: null counts: google_cloud_run_service: 1 diff --git a/tests/modules/cloud_run/examples/connector.yaml b/tests/modules/cloud_run/examples/connector.yaml index 79c5c3794b..a23c5c7822 100644 --- a/tests/modules/cloud_run/examples/connector.yaml +++ b/tests/modules/cloud_run/examples/connector.yaml @@ -16,11 +16,13 @@ values: module.cloud_run.google_cloud_run_service.service: autogenerate_revision_name: false location: europe-west1 + metadata: + - {} name: hello project: project-id template: - metadata: - - labels: null + - {} spec: - containers: - args: null diff --git a/tests/modules/cloud_run/examples/revision-annotations.yaml b/tests/modules/cloud_run/examples/revision-annotations.yaml index 21062d3e84..7d5e1c0181 100644 --- a/tests/modules/cloud_run/examples/revision-annotations.yaml +++ b/tests/modules/cloud_run/examples/revision-annotations.yaml @@ -14,6 +14,12 @@ values: module.cloud_run.google_cloud_run_service.service: + autogenerate_revision_name: false + location: europe-west1 + metadata: + - {} + name: hello + project: project-id template: - metadata: - annotations: @@ -21,7 +27,6 @@ values: autoscaling.knative.dev/minScale: '1' run.googleapis.com/vpc-access-connector: foo run.googleapis.com/vpc-access-egress: all-traffic - labels: null spec: - containers: - args: null @@ -36,7 +41,3 @@ values: counts: google_cloud_run_service: 1 - modules: 1 - resources: 1 - -outputs: {} diff --git a/tests/modules/cloud_run/examples/secrets.yaml b/tests/modules/cloud_run/examples/secrets.yaml index 590dab45bf..c6d4d34d35 100644 --- a/tests/modules/cloud_run/examples/secrets.yaml +++ b/tests/modules/cloud_run/examples/secrets.yaml @@ -14,9 +14,15 @@ values: module.cloud_run.google_cloud_run_service.service: + autogenerate_revision_name: false + location: region + metadata: + - {} + name: hello + project: project-id template: - metadata: - - labels: null + - {} spec: - containers: - args: null diff --git a/tests/modules/cloud_run/examples/service-account-external.yaml b/tests/modules/cloud_run/examples/service-account-external.yaml index 808bf00c72..fc291c9d08 100644 --- a/tests/modules/cloud_run/examples/service-account-external.yaml +++ b/tests/modules/cloud_run/examples/service-account-external.yaml @@ -14,9 +14,15 @@ values: module.cloud_run.google_cloud_run_service.service: + autogenerate_revision_name: false + location: europe-west1 + metadata: + - {} + name: hello + project: my-project template: - metadata: - - labels: null + - {} spec: - containers: - args: null diff --git a/tests/modules/cloud_run/examples/service-account.yaml b/tests/modules/cloud_run/examples/service-account.yaml index 1e2ed48ced..30b675948c 100644 --- a/tests/modules/cloud_run/examples/service-account.yaml +++ b/tests/modules/cloud_run/examples/service-account.yaml @@ -22,7 +22,7 @@ values: project: my-project template: - metadata: - - labels: null + - {} spec: - containers: - args: null @@ -36,6 +36,9 @@ values: volumes: [] module.cloud_run.google_service_account.service_account[0]: account_id: tf-cr-hello + description: null + disabled: false + display_name: Terraform Cloud Run hello. project: my-project counts: diff --git a/tests/modules/cloud_run/examples/simple.yaml b/tests/modules/cloud_run/examples/simple.yaml index 32c38ba402..0964624ce0 100644 --- a/tests/modules/cloud_run/examples/simple.yaml +++ b/tests/modules/cloud_run/examples/simple.yaml @@ -16,11 +16,13 @@ values: module.cloud_run.google_cloud_run_service.service: autogenerate_revision_name: false location: europe-west1 + metadata: + - {} name: hello project: my-project template: - metadata: - - labels: null + - {} spec: - containers: - args: null