Skip to content

Commit b88b793

Browse files
committed
remove ASM example
1 parent 6e8e500 commit b88b793

File tree

12 files changed

+4
-359
lines changed

12 files changed

+4
-359
lines changed

build/int.cloudbuild.yaml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -365,21 +365,6 @@ steps:
365365
- verify safer-cluster-iap-bastion-local
366366
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
367367
args: ['/bin/bash', '-c', 'cft test run TestSaferClusterIapBastion --stage teardown --verbose']
368-
- id: apply simple-zonal-with-asm-local
369-
waitFor:
370-
- create-all
371-
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
372-
args: ['/bin/bash', '-c', 'cft test run TestAll/examples/simple_zonal_with_asm --stage apply --verbose --test-dir test/integration']
373-
- id: verify simple-zonal-with-asm-local
374-
waitFor:
375-
- apply simple-zonal-with-asm-local
376-
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
377-
args: ['/bin/bash', '-c', 'cft test run TestAll/examples/simple_zonal_with_asm --stage verify --verbose --test-dir test/integration']
378-
- id: teardown simple-zonal-with-asm-local
379-
waitFor:
380-
- verify simple-zonal-with-asm-local
381-
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
382-
args: ['/bin/bash', '-c', 'cft test run TestAll/examples/simple_zonal_with_asm --stage teardown --verbose --test-dir test/integration']
383368
- id: apply simple-autopilot-private-local
384369
waitFor:
385370
- create-all

docs/upgrading_to_v36.0.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
The v36.0 release of *kubernetes-engine* is a backwards incompatible release.
33

44
### ASM Sub-Module Removal
5-
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.
5+
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
6+
/mesh](https://github.com/terraform-google-modules/terraform-docs-samples/tree/main/gke/autopilot/basic).
67

78

89
```diff

examples/simple_zonal_with_asm/README.md

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

examples/simple_zonal_with_asm/asm.tf

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

examples/simple_zonal_with_asm/main.tf

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

examples/simple_zonal_with_asm/network.tf

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

examples/simple_zonal_with_asm/outputs.tf

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

examples/simple_zonal_with_asm/variables.tf

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

examples/simple_zonal_with_asm/versions.tf

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

test/setup/iam.tf

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,6 @@ resource "google_project_iam_member" "int_test_fleet" {
114114
member = "serviceAccount:${google_service_account.int_test.email}"
115115
}
116116

117-
resource "google_project_iam_member" "int_test_default" {
118-
for_each = toset(local.int_required_roles)
119-
120-
project = module.gke-project-default.project_id
121-
role = each.value
122-
member = "serviceAccount:${google_service_account.int_test.email}"
123-
}
124-
125117
resource "google_service_account_key" "int_test" {
126118
service_account_id = google_service_account.int_test.id
127119
}

0 commit comments

Comments
 (0)