Skip to content

Commit 1ff1aca

Browse files
committed
remove ASM example
1 parent ff35351 commit 1ff1aca

File tree

11 files changed

+4
-344
lines changed

11 files changed

+4
-344
lines changed

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
}

test/setup/main.tf

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2019-2024 Google LLC
2+
* Copyright 2019 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -120,17 +120,3 @@ module "gke-project-fleet" {
120120
activate_apis = local.apis
121121
}
122122

123-
module "gke-project-default" {
124-
source = "terraform-google-modules/project-factory/google"
125-
version = "~> 17.0"
126-
127-
name = "ci-gke-default-${random_id.random_project_id_suffix.hex}"
128-
random_project_id = true
129-
org_id = var.org_id
130-
folder_id = var.folder_id
131-
billing_account = var.billing_account
132-
# due to https://github.com/hashicorp/terraform-provider-google/issues/9505 for AP
133-
default_service_account = "keep"
134-
135-
activate_apis = local.apis
136-
}

0 commit comments

Comments
 (0)