remove ASM example

terraform-google-modules · Jan 24, 2025 · 1ff1aca · 1ff1aca
1 parent ff35351
commit 1ff1aca
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 344 deletions.
diff --git a/docs/upgrading_to_v36.0.md b/docs/upgrading_to_v36.0.md
@@ -2,7 +2,8 @@
 The v36.0 release of *kubernetes-engine* is a backwards incompatible release.
 
 ### ASM Sub-Module Removal
-The ASM Sub-Module has been removed in v36.0.  Please use the [google_gke_hub_feature](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature#example-usage---enable-fleet-default-member-config-service-mesh) and [google_gke_hub_feature_membership](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature_membership#example-usage---service-mesh) resources.
+The ASM Sub-Module has been removed in v36.0.  Please use the [google_gke_hub_feature](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature#example-usage---enable-fleet-default-member-config-service-mesh) and [google_gke_hub_feature_membership](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature_membership#example-usage---service-mesh) resources.  For another example, see [terraform-docs-samples/gke/autopilot
+/mesh](https://github.com/terraform-google-modules/terraform-docs-samples/tree/main/gke/autopilot/basic).
 
 
 ```diff

diff --git a/examples/simple_zonal_with_asm/README.md b/examples/simple_zonal_with_asm/README.md
diff --git a/examples/simple_zonal_with_asm/asm.tf b/examples/simple_zonal_with_asm/asm.tf
diff --git a/examples/simple_zonal_with_asm/main.tf b/examples/simple_zonal_with_asm/main.tf
diff --git a/examples/simple_zonal_with_asm/network.tf b/examples/simple_zonal_with_asm/network.tf
diff --git a/examples/simple_zonal_with_asm/outputs.tf b/examples/simple_zonal_with_asm/outputs.tf
diff --git a/examples/simple_zonal_with_asm/variables.tf b/examples/simple_zonal_with_asm/variables.tf
diff --git a/examples/simple_zonal_with_asm/versions.tf b/examples/simple_zonal_with_asm/versions.tf
diff --git a/test/setup/iam.tf b/test/setup/iam.tf
@@ -114,14 +114,6 @@ resource "google_project_iam_member" "int_test_fleet" {
   member  = "serviceAccount:${google_service_account.int_test.email}"
 }
 
-resource "google_project_iam_member" "int_test_default" {
-  for_each = toset(local.int_required_roles)
-
-  project = module.gke-project-default.project_id
-  role    = each.value
-  member  = "serviceAccount:${google_service_account.int_test.email}"
-}
-
 resource "google_service_account_key" "int_test" {
   service_account_id = google_service_account.int_test.id
 }

diff --git a/test/setup/main.tf b/test/setup/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2024 Google LLC
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -120,17 +120,3 @@ module "gke-project-fleet" {
   activate_apis = local.apis
 }
 
-module "gke-project-default" {
-  source  = "terraform-google-modules/project-factory/google"
-  version = "~> 17.0"
-
-  name              = "ci-gke-default-${random_id.random_project_id_suffix.hex}"
-  random_project_id = true
-  org_id            = var.org_id
-  folder_id         = var.folder_id
-  billing_account   = var.billing_account
-  # due to https://github.com/hashicorp/terraform-provider-google/issues/9505 for AP
-  default_service_account = "keep"
-
-  activate_apis = local.apis
-}
diff --git a/test/setup/outputs.tf b/test/setup/outputs.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2024 Google LLC
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,10 +18,6 @@ output "project_ids" {
   value = [module.gke-project-1.project_id, module.gke-project-2.project_id, module.gke-project-asm.project_id, module.gke-project-fleet.project_id]
 }
 
-output "project_id" {
-  value = module.gke-project-default.project_id
-}
-
 output "sa_key" {
   value     = google_service_account_key.int_test.private_key
   sensitive = true