feat!: remove ASM sub-module (#2168)

terraform-google-modules · Feb 3, 2025 · 010e034 · 010e034
1 parent bb7ec93
commit 010e034
Show file tree

Hide file tree

Showing 22 changed files with 39 additions and 1,088 deletions.
diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
@@ -375,21 +375,6 @@ steps:
     - verify safer-cluster-iap-bastion-local
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'cft test run TestSaferClusterIapBastion --stage teardown --verbose']
-- id: apply simple-zonal-with-asm-local
-  waitFor:
-    - init-all
-  name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
-  args: ['/bin/bash', '-c', 'cft test run TestSimpleZonalWithASM --stage apply --verbose']
-- id: verify simple-zonal-with-asm-local
-  waitFor:
-    - apply simple-zonal-with-asm-local
-  name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
-  args: ['/bin/bash', '-c', 'cft test run TestSimpleZonalWithASM --stage verify --verbose']
-- id: teardown simple-zonal-with-asm-local
-  waitFor:
-    - verify simple-zonal-with-asm-local
-  name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
-  args: ['/bin/bash', '-c', 'cft test run TestSimpleZonalWithASM --stage teardown --verbose']
 - id: apply simple-autopilot-private-local
   waitFor:
     - init-all

diff --git a/docs/upgrading_to_v36.0.md b/docs/upgrading_to_v36.0.md
@@ -24,3 +24,42 @@ The variable `logging_variant` has been removed from the Autopilot sub-modules.
 -   logging_variant = "DEFAULT"
 }
 ```
+
+### 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.  For another example, see [terraform-docs-samples/gke/autopilot
+/mesh](https://github.com/terraform-google-modules/terraform-docs-samples/tree/main/gke/autopilot/mesh).
+
+
+```diff
+-module "asm" {
+-  source  = "terraform-google-modules/kubernetes-engine/google//modules/asm"
+-  version = "~> 35.0"
+
+-  project_id                = var.project_id
+-  cluster_name              = module.gke.name
+-  cluster_location          = module.gke.location
+-  multicluster_mode         = "connected"
+-  enable_cni                = true
+-  enable_fleet_registration = true
+-  enable_mesh_feature       = true
+-}
+
++resource "google_gke_hub_feature" "mesh_feature" {
++  project  = var.project_id
++  location = "global"
++  name     = "servicemesh"
++}
+
++resource "google_gke_hub_feature_membership" "mesh_feature_membership" {
++  project  = var.project_id
++  location = "global"
+
++  feature             = google_gke_hub_feature.mesh_feature.name
++  membership          = module.gke.fleet_membership
++  membership_location = module.gke.region
+
++  mesh {
++    management = "MANAGEMENT_AUTOMATIC"
++  }
++}
+```
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/main.tf b/examples/simple_zonal_with_asm/main.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/test_outputs.tf b/examples/simple_zonal_with_asm/test_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