Skip to content

Commit 010e034

Browse files
authored
feat!: remove ASM sub-module (#2168)
1 parent bb7ec93 commit 010e034

File tree

22 files changed

+39
-1088
lines changed

22 files changed

+39
-1088
lines changed

build/int.cloudbuild.yaml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -375,21 +375,6 @@ steps:
375375
- verify safer-cluster-iap-bastion-local
376376
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
377377
args: ['/bin/bash', '-c', 'cft test run TestSaferClusterIapBastion --stage teardown --verbose']
378-
- id: apply simple-zonal-with-asm-local
379-
waitFor:
380-
- init-all
381-
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
382-
args: ['/bin/bash', '-c', 'cft test run TestSimpleZonalWithASM --stage apply --verbose']
383-
- id: verify simple-zonal-with-asm-local
384-
waitFor:
385-
- apply simple-zonal-with-asm-local
386-
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
387-
args: ['/bin/bash', '-c', 'cft test run TestSimpleZonalWithASM --stage verify --verbose']
388-
- id: teardown simple-zonal-with-asm-local
389-
waitFor:
390-
- verify simple-zonal-with-asm-local
391-
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
392-
args: ['/bin/bash', '-c', 'cft test run TestSimpleZonalWithASM --stage teardown --verbose']
393378
- id: apply simple-autopilot-private-local
394379
waitFor:
395380
- init-all

docs/upgrading_to_v36.0.md

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,42 @@ The variable `logging_variant` has been removed from the Autopilot sub-modules.
2424
- logging_variant = "DEFAULT"
2525
}
2626
```
27+
28+
### ASM Sub-Module Removal
29+
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
30+
/mesh](https://github.com/terraform-google-modules/terraform-docs-samples/tree/main/gke/autopilot/mesh).
31+
32+
33+
```diff
34+
-module "asm" {
35+
- source = "terraform-google-modules/kubernetes-engine/google//modules/asm"
36+
- version = "~> 35.0"
37+
38+
- project_id = var.project_id
39+
- cluster_name = module.gke.name
40+
- cluster_location = module.gke.location
41+
- multicluster_mode = "connected"
42+
- enable_cni = true
43+
- enable_fleet_registration = true
44+
- enable_mesh_feature = true
45+
-}
46+
47+
+resource "google_gke_hub_feature" "mesh_feature" {
48+
+ project = var.project_id
49+
+ location = "global"
50+
+ name = "servicemesh"
51+
+}
52+
53+
+resource "google_gke_hub_feature_membership" "mesh_feature_membership" {
54+
+ project = var.project_id
55+
+ location = "global"
56+
57+
+ feature = google_gke_hub_feature.mesh_feature.name
58+
+ membership = module.gke.fleet_membership
59+
+ membership_location = module.gke.region
60+
61+
+ mesh {
62+
+ management = "MANAGEMENT_AUTOMATIC"
63+
+ }
64+
+}
65+
```

examples/simple_zonal_with_asm/README.md

Lines changed: 0 additions & 44 deletions
This file was deleted.

examples/simple_zonal_with_asm/main.tf

Lines changed: 0 additions & 70 deletions
This file was deleted.

examples/simple_zonal_with_asm/outputs.tf

Lines changed: 0 additions & 35 deletions
This file was deleted.

examples/simple_zonal_with_asm/test_outputs.tf

Lines changed: 0 additions & 67 deletions
This file was deleted.

examples/simple_zonal_with_asm/variables.tf

Lines changed: 0 additions & 44 deletions
This file was deleted.

examples/simple_zonal_with_asm/versions.tf

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)