diff --git a/examples/deploy_service/main.tf b/examples/deploy_service/main.tf index 341604ae2d..efb3bd8388 100644 --- a/examples/deploy_service/main.tf +++ b/examples/deploy_service/main.tf @@ -19,7 +19,7 @@ locals { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" region = var.region } diff --git a/examples/disable_client_cert/main.tf b/examples/disable_client_cert/main.tf index 89f0a47121..8aa0791446 100644 --- a/examples/disable_client_cert/main.tf +++ b/examples/disable_client_cert/main.tf @@ -19,7 +19,7 @@ locals { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" region = var.region } diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf index 3cacf0bb63..d0358e5ffd 100644 --- a/examples/node_pool/main.tf +++ b/examples/node_pool/main.tf @@ -19,7 +19,7 @@ locals { } provider "google-beta" { - version = "~> 3.32.0" + version = "~> 3.35.0" region = var.region } diff --git a/examples/node_pool_update_variant/main.tf b/examples/node_pool_update_variant/main.tf index 700ea9d5f5..1694f9248e 100644 --- a/examples/node_pool_update_variant/main.tf +++ b/examples/node_pool_update_variant/main.tf @@ -19,7 +19,7 @@ locals { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" region = var.region } diff --git a/examples/node_pool_update_variant_beta/main.tf b/examples/node_pool_update_variant_beta/main.tf index 12e1d52cad..cbfa818bdb 100644 --- a/examples/node_pool_update_variant_beta/main.tf +++ b/examples/node_pool_update_variant_beta/main.tf @@ -19,7 +19,7 @@ locals { } provider "google-beta" { - version = "~> 3.32.0" + version = "~> 3.35.0" credentials = file(var.credentials_path) region = var.region } diff --git a/examples/regional_private_node_pool_oauth_scopes/provider.tf b/examples/regional_private_node_pool_oauth_scopes/provider.tf index 48644bf6c1..543821ce86 100644 --- a/examples/regional_private_node_pool_oauth_scopes/provider.tf +++ b/examples/regional_private_node_pool_oauth_scopes/provider.tf @@ -15,9 +15,9 @@ */ provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" } provider "google-beta" { - version = "~> 3.32.0" + version = "~> 3.35.0" } diff --git a/examples/safer_cluster/main.tf b/examples/safer_cluster/main.tf index a1087f607d..3d0f5aa39c 100644 --- a/examples/safer_cluster/main.tf +++ b/examples/safer_cluster/main.tf @@ -30,11 +30,11 @@ locals { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" } provider "google-beta" { - version = "~> 3.32.0" + version = "~> 3.35.0" } module "gke" { diff --git a/examples/safer_cluster_iap_bastion/provider.tf b/examples/safer_cluster_iap_bastion/provider.tf index 7f894855b6..b19b4bfb01 100644 --- a/examples/safer_cluster_iap_bastion/provider.tf +++ b/examples/safer_cluster_iap_bastion/provider.tf @@ -15,9 +15,9 @@ */ provider "google" { - version = "~> 3.32.0" + version = "~> 3.35.0" } provider "google-beta" { - version = "~> 3.32.0" + version = "~> 3.35.0" } diff --git a/examples/shared_vpc/main.tf b/examples/shared_vpc/main.tf index 0784c6f24d..876339c8eb 100644 --- a/examples/shared_vpc/main.tf +++ b/examples/shared_vpc/main.tf @@ -19,7 +19,7 @@ locals { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" region = var.region } diff --git a/examples/simple_regional/main.tf b/examples/simple_regional/main.tf index 70f03995af..766ead4031 100644 --- a/examples/simple_regional/main.tf +++ b/examples/simple_regional/main.tf @@ -19,7 +19,7 @@ locals { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" region = var.region } diff --git a/examples/simple_regional_beta/main.tf b/examples/simple_regional_beta/main.tf index 3a883b4353..81c72f0f2c 100644 --- a/examples/simple_regional_beta/main.tf +++ b/examples/simple_regional_beta/main.tf @@ -19,7 +19,7 @@ locals { } provider "google-beta" { - version = "~> 3.32.0" + version = "~> 3.35.0" region = var.region } diff --git a/examples/simple_regional_private/main.tf b/examples/simple_regional_private/main.tf index 9f5c51f8d5..b6224af20a 100644 --- a/examples/simple_regional_private/main.tf +++ b/examples/simple_regional_private/main.tf @@ -19,7 +19,7 @@ locals { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" region = var.region } diff --git a/examples/simple_regional_private_beta/main.tf b/examples/simple_regional_private_beta/main.tf index 51216fefa7..a311609a7b 100644 --- a/examples/simple_regional_private_beta/main.tf +++ b/examples/simple_regional_private_beta/main.tf @@ -19,12 +19,12 @@ locals { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" region = var.region } provider "google-beta" { - version = "~> 3.32.0" + version = "~> 3.35.0" region = var.region } diff --git a/examples/simple_regional_with_kubeconfig/main.tf b/examples/simple_regional_with_kubeconfig/main.tf index c1a0a024de..da2911e669 100644 --- a/examples/simple_regional_with_kubeconfig/main.tf +++ b/examples/simple_regional_with_kubeconfig/main.tf @@ -19,7 +19,7 @@ locals { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" region = var.region } diff --git a/examples/simple_regional_with_networking/main.tf b/examples/simple_regional_with_networking/main.tf index 1eefe851aa..7a529c2e4a 100644 --- a/examples/simple_regional_with_networking/main.tf +++ b/examples/simple_regional_with_networking/main.tf @@ -15,7 +15,7 @@ */ provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" } module "gcp-network" { diff --git a/examples/simple_zonal_private/main.tf b/examples/simple_zonal_private/main.tf index 492f396970..e6279ca88c 100644 --- a/examples/simple_zonal_private/main.tf +++ b/examples/simple_zonal_private/main.tf @@ -19,7 +19,7 @@ locals { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" region = var.region } diff --git a/examples/simple_zonal_with_acm/main.tf b/examples/simple_zonal_with_acm/main.tf index 533af5aa4f..b234a06901 100644 --- a/examples/simple_zonal_with_acm/main.tf +++ b/examples/simple_zonal_with_acm/main.tf @@ -19,7 +19,7 @@ locals { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" region = var.region } diff --git a/examples/simple_zonal_with_asm/main.tf b/examples/simple_zonal_with_asm/main.tf index cbf1d3f19f..5148323bc3 100644 --- a/examples/simple_zonal_with_asm/main.tf +++ b/examples/simple_zonal_with_asm/main.tf @@ -19,7 +19,7 @@ locals { } provider "google-beta" { - version = "~> 3.32.0" + version = "~> 3.35.0" region = var.region } diff --git a/examples/stub_domains/main.tf b/examples/stub_domains/main.tf index be779155ac..8e65ad659b 100644 --- a/examples/stub_domains/main.tf +++ b/examples/stub_domains/main.tf @@ -19,7 +19,7 @@ locals { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" region = var.region } diff --git a/examples/stub_domains_private/main.tf b/examples/stub_domains_private/main.tf index 2e8b6ca5c2..77f202caf5 100644 --- a/examples/stub_domains_private/main.tf +++ b/examples/stub_domains_private/main.tf @@ -15,7 +15,7 @@ */ provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" region = var.region } diff --git a/examples/stub_domains_upstream_nameservers/main.tf b/examples/stub_domains_upstream_nameservers/main.tf index afdad4fa49..7d720375dd 100644 --- a/examples/stub_domains_upstream_nameservers/main.tf +++ b/examples/stub_domains_upstream_nameservers/main.tf @@ -19,7 +19,7 @@ locals { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" region = var.region } diff --git a/examples/upstream_nameservers/main.tf b/examples/upstream_nameservers/main.tf index 58207ce371..16b81816e4 100644 --- a/examples/upstream_nameservers/main.tf +++ b/examples/upstream_nameservers/main.tf @@ -19,7 +19,7 @@ locals { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" region = var.region } diff --git a/examples/workload_identity/main.tf b/examples/workload_identity/main.tf index 731a1a2d6b..d41a442a30 100644 --- a/examples/workload_identity/main.tf +++ b/examples/workload_identity/main.tf @@ -19,7 +19,7 @@ locals { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" region = var.region } diff --git a/examples/workload_metadata_config/main.tf b/examples/workload_metadata_config/main.tf index 65ec36ce3a..2909afa176 100644 --- a/examples/workload_metadata_config/main.tf +++ b/examples/workload_metadata_config/main.tf @@ -19,7 +19,7 @@ locals { } provider "google-beta" { - version = "~> 3.32.0" + version = "~> 3.35.0" region = var.region } diff --git a/modules/asm/scripts/install_asm.sh b/modules/asm/scripts/install_asm.sh index 707cd7f9d7..3f744eca28 100755 --- a/modules/asm/scripts/install_asm.sh +++ b/modules/asm/scripts/install_asm.sh @@ -54,8 +54,12 @@ kpt cfg set asm-patch/ gcloud.core.project "${PROJECT_ID}" kpt cfg set asm-patch/ gcloud.container.cluster "${CLUSTER_NAME}" kpt cfg set asm-patch/ gcloud.compute.location "${CLUSTER_LOCATION}" kpt cfg list-setters asm-patch/ -pushd ${BASE_DIR} && kustomize create --autodetect --namespace "${PROJECT_ID}" && popd -pushd asm-patch && kustomize build -o ../${BASE_DIR}/all.yaml && popd +pushd ${BASE_DIR} +kustomize create --autodetect --namespace "${PROJECT_ID}" +popd +pushd asm-patch +kustomize build -o ../${BASE_DIR}/all.yaml +popd # # skip validate as we should investigate if we can check this without having to resort to dind # if [[ ${SKIP_ASM_VALIDATION} ]]; then # echo "Skipping ASM validation..." diff --git a/test/fixtures/deploy_service/network.tf b/test/fixtures/deploy_service/network.tf index 513747de52..8a49648088 100644 --- a/test/fixtures/deploy_service/network.tf +++ b/test/fixtures/deploy_service/network.tf @@ -21,7 +21,7 @@ resource "random_string" "suffix" { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" project = var.project_ids[0] } diff --git a/test/fixtures/disable_client_cert/network.tf b/test/fixtures/disable_client_cert/network.tf index 513747de52..8a49648088 100644 --- a/test/fixtures/disable_client_cert/network.tf +++ b/test/fixtures/disable_client_cert/network.tf @@ -21,7 +21,7 @@ resource "random_string" "suffix" { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" project = var.project_ids[0] } diff --git a/test/fixtures/shared_vpc/network.tf b/test/fixtures/shared_vpc/network.tf index 513747de52..8a49648088 100644 --- a/test/fixtures/shared_vpc/network.tf +++ b/test/fixtures/shared_vpc/network.tf @@ -21,7 +21,7 @@ resource "random_string" "suffix" { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" project = var.project_ids[0] } diff --git a/test/fixtures/simple_regional/network.tf b/test/fixtures/simple_regional/network.tf index 513747de52..8a49648088 100644 --- a/test/fixtures/simple_regional/network.tf +++ b/test/fixtures/simple_regional/network.tf @@ -21,7 +21,7 @@ resource "random_string" "suffix" { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" project = var.project_ids[0] } diff --git a/test/fixtures/simple_regional_with_kubeconfig/network.tf b/test/fixtures/simple_regional_with_kubeconfig/network.tf index 75f23bea66..eb30a9b570 100644 --- a/test/fixtures/simple_regional_with_kubeconfig/network.tf +++ b/test/fixtures/simple_regional_with_kubeconfig/network.tf @@ -21,7 +21,7 @@ resource "random_string" "suffix" { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" project = var.project_ids[0] } diff --git a/test/fixtures/simple_zonal/network.tf b/test/fixtures/simple_zonal/network.tf index c4c25d587a..542b3904cf 100644 --- a/test/fixtures/simple_zonal/network.tf +++ b/test/fixtures/simple_zonal/network.tf @@ -21,7 +21,7 @@ resource "random_string" "suffix" { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" project = var.project_ids[1] } diff --git a/test/fixtures/simple_zonal_with_asm/network.tf b/test/fixtures/simple_zonal_with_asm/network.tf index 194b20884a..3ddc86721c 100644 --- a/test/fixtures/simple_zonal_with_asm/network.tf +++ b/test/fixtures/simple_zonal_with_asm/network.tf @@ -21,7 +21,7 @@ resource "random_string" "suffix" { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" project = var.project_ids[2] } diff --git a/test/fixtures/stub_domains/network.tf b/test/fixtures/stub_domains/network.tf index 5a8d36e7c1..fd97996503 100644 --- a/test/fixtures/stub_domains/network.tf +++ b/test/fixtures/stub_domains/network.tf @@ -21,7 +21,7 @@ resource "random_string" "suffix" { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" project = var.project_ids[1] } diff --git a/test/fixtures/stub_domains_upstream_nameservers/network.tf b/test/fixtures/stub_domains_upstream_nameservers/network.tf index a1f546be28..153058fa26 100644 --- a/test/fixtures/stub_domains_upstream_nameservers/network.tf +++ b/test/fixtures/stub_domains_upstream_nameservers/network.tf @@ -21,7 +21,7 @@ resource "random_string" "suffix" { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" project = var.project_ids[1] } diff --git a/test/fixtures/upstream_nameservers/network.tf b/test/fixtures/upstream_nameservers/network.tf index a1f546be28..153058fa26 100644 --- a/test/fixtures/upstream_nameservers/network.tf +++ b/test/fixtures/upstream_nameservers/network.tf @@ -21,7 +21,7 @@ resource "random_string" "suffix" { } provider "google" { - version = "~> 3.16.0" + version = "~> 3.35.0" project = var.project_ids[1] } diff --git a/test/setup/main.tf b/test/setup/main.tf index b05aeb1501..3cf7fae4e6 100644 --- a/test/setup/main.tf +++ b/test/setup/main.tf @@ -32,15 +32,9 @@ module "gke-project-1" { auto_create_network = true activate_apis = [ - "bigquery.googleapis.com", "cloudkms.googleapis.com", "cloudresourcemanager.googleapis.com", - "compute.googleapis.com", "container.googleapis.com", - "containerregistry.googleapis.com", - "iam.googleapis.com", - "iamcredentials.googleapis.com", - "oslogin.googleapis.com", "pubsub.googleapis.com", "serviceusage.googleapis.com", "storage-api.googleapis.com", @@ -59,15 +53,9 @@ module "gke-project-2" { skip_gcloud_download = true activate_apis = [ - "bigquery.googleapis.com", "cloudkms.googleapis.com", "cloudresourcemanager.googleapis.com", - "compute.googleapis.com", "container.googleapis.com", - "containerregistry.googleapis.com", - "iam.googleapis.com", - "iamcredentials.googleapis.com", - "oslogin.googleapis.com", "pubsub.googleapis.com", "serviceusage.googleapis.com", "storage-api.googleapis.com", @@ -87,17 +75,11 @@ module "gke-project-asm" { skip_gcloud_download = true activate_apis = [ - "container.googleapis.com", - "compute.googleapis.com", - "monitoring.googleapis.com", "logging.googleapis.com", "meshca.googleapis.com", "meshtelemetry.googleapis.com", "meshconfig.googleapis.com", - "iamcredentials.googleapis.com", "anthos.googleapis.com", - "gkeconnect.googleapis.com", - "gkehub.googleapis.com", "cloudresourcemanager.googleapis.com", ] }