Skip to content

Commit 763be93

Browse files
committed
feat!: remove ACM sub-module
1 parent 70a28a0 commit 763be93

File tree

30 files changed

+88
-1856
lines changed

30 files changed

+88
-1856
lines changed

build/int.cloudbuild.yaml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2019 Google LLC
1+
# Copyright 2019-2025 Google LLC
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -170,21 +170,6 @@ steps:
170170
- verify simple-regional-with-networking-local
171171
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
172172
args: ['/bin/bash', '-c', 'cft test run TestSimpleRegionalWithNetworking --stage teardown --verbose']
173-
- id: apply simple-zonal-local
174-
waitFor:
175-
- create-all
176-
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
177-
args: ['/bin/bash', '-c', 'cft test run TestSimpleZonal --stage apply --verbose']
178-
- id: verify simple-zonal-local
179-
waitFor:
180-
- apply simple-zonal-local
181-
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
182-
args: ['/bin/bash', '-c', 'cft test run TestSimpleZonal --stage verify --verbose']
183-
- id: destroy simple-zonal-local
184-
waitFor:
185-
- verify simple-zonal-local
186-
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
187-
args: ['/bin/bash', '-c', 'cft test run TestSimpleZonal --stage teardown --verbose']
188173
- id: apply simple-zonal-private-local
189174
waitFor:
190175
- create-all

docs/upgrading_to_v36.0.md

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
# Upgrading to v36.0
2+
The v36.0 release of *kubernetes-engine* is a backwards incompatible release.
3+
4+
### ACM Sub-Module Removal
5+
The ACM 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-configmanagement) and [google_gke_hub_feature_membership](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/gke_hub_feature_membership#example-usage---config-management-with-git) resources. For additional examples, see [terraform-docs-samples/gke/autopilot/config_sync](https://github.com/terraform-google-modules/terraform-docs-samples/tree/main/gke/autopilot/basic) and [terraform-docs-samples/gke/autopilot/policycontroller](https://github.com/terraform-google-modules/terraform-docs-samples/tree/main/gke/autopilot/policycontroller).
6+
7+
8+
```diff
9+
-module "acm" {
10+
- source = "terraform-google-modules/kubernetes-engine/google//modules/acm"
11+
- version = "~> 35.0"
12+
- project_id = var.project_id
13+
- location = module.gke.location
14+
- cluster_name = module.gke.name
15+
16+
- # Config Sync
17+
- enable_config_sync = true
18+
- sync_repo = "[email protected]:GoogleCloudPlatform/anthos-config-management-samples.git"
19+
- sync_branch = "1.0.0"
20+
- policy_dir = "foo-corp"
21+
22+
- # Policy Controller
23+
- enable_policy_controller = true
24+
- enable_fleet_feature = true
25+
- install_template_library = true
26+
- enable_referential_rules = true
27+
- policy_bundles = ["https://github.com/GoogleCloudPlatform/acm-policy-controller-library.git/bundles/pss-baseline-v2022"]
28+
-}
29+
30+
# Config Sync
31+
+resource "google_gke_hub_feature" "config_feature" {
32+
+ project = var.project_id
33+
+ location = "global"
34+
+ name = "servicemesh"
35+
+}
36+
37+
+resource "google_gke_hub_feature_membership" "config_feature_membership" {
38+
+ project = var.project_id
39+
+ location = "global"
40+
41+
+ feature = google_gke_hub_feature.config_feature.name
42+
+ membership = module.gke.fleet_membership
43+
+ membership_location = module.gke.region
44+
45+
+ configmanagement {
46+
+ config_sync {
47+
+ enabled = true
48+
+ git {
49+
+ sync_repo = "[email protected]:GoogleCloudPlatform/anthos-config-management-samples.git"
50+
+ sync_branch = "1.0.0"
51+
+ policy_dir = "foo-corp"
52+
+ }
53+
+ }
54+
+ }
55+
+}
56+
57+
# Policy Controller
58+
+resource "google_gke_hub_feature" "poco_feature" {
59+
+ name = "policycontroller"
60+
+ project = var.project_id
61+
+ location = "global"
62+
+}
63+
+
64+
+resource "google_gke_hub_feature_membership" "poco_feature_membership" {
65+
+ project = var.project_id
66+
+ location = "global"
67+
+
68+
+ feature = google_gke_hub_feature.poco_feature.name
69+
+ membership = module.gke.fleet_membership
70+
+ membership_location = module.gke.region
71+
+
72+
+ policycontroller {
73+
+ policy_controller_hub_config {
74+
+ install_spec = "INSTALL_SPEC_ENABLED"
75+
+ policy_content {
76+
+ template_library {
77+
+ installation = "ALL"
78+
+ }
79+
+ bundles {
80+
+ bundle_name = "pss-baseline-v2022"
81+
+ }
82+
+ }
83+
+ referential_rules_enabled = true
84+
+ }
85+
+ }
86+
+}
87+
```

examples/simple_zonal_with_acm/README.md

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

examples/simple_zonal_with_acm/acm.tf

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

examples/simple_zonal_with_acm/main.tf

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

examples/simple_zonal_with_acm/network.tf

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

0 commit comments

Comments
 (0)