Skip to content

Commit

Permalink
feat!: remove ACM sub-module
Browse files Browse the repository at this point in the history
  • Loading branch information
apeabody committed Jan 24, 2025
1 parent 4726ab2 commit 8709e6a
Show file tree
Hide file tree
Showing 30 changed files with 87 additions and 1,854 deletions.
15 changes: 0 additions & 15 deletions build/int.cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -164,21 +164,6 @@ steps:
- verify simple-regional-with-networking-local
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'cft test run TestSimpleRegionalWithNetworking --stage teardown --verbose']
- id: apply simple-zonal-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 TestSimpleZonal --stage apply --verbose']
- id: verify simple-zonal-local
waitFor:
- apply simple-zonal-local
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'cft test run TestSimpleZonal --stage verify --verbose']
- id: teardown simple-zonal-local
waitFor:
- verify simple-zonal-local
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'cft test run TestSimpleZonal --stage teardown --verbose']
- id: apply simple-zonal-private-local
waitFor:
- init-all
Expand Down
87 changes: 87 additions & 0 deletions docs/upgrading_to_v36.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
# Upgrading to v36.0
The v36.0 release of *kubernetes-engine* is a backwards incompatible release.

### ACM Sub-Module Removal
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).


```diff
-module "acm" {
- source = "terraform-google-modules/kubernetes-engine/google//modules/acm"
- version = "~> 35.0"
- project_id = var.project_id
- location = module.gke.location
- cluster_name = module.gke.name

- # Config Sync
- enable_config_sync = true
- sync_repo = "[email protected]:GoogleCloudPlatform/anthos-config-management-samples.git"
- sync_branch = "1.0.0"
- policy_dir = "foo-corp"

- # Policy Controller
- enable_policy_controller = true
- enable_fleet_feature = true
- install_template_library = true
- enable_referential_rules = true
- policy_bundles = ["https://github.com/GoogleCloudPlatform/acm-policy-controller-library.git/bundles/pss-baseline-v2022"]
-}

# Config Sync
+resource "google_gke_hub_feature" "config_feature" {
+ project = var.project_id
+ location = "global"
+ name = "servicemesh"
+}

+resource "google_gke_hub_feature_membership" "config_feature_membership" {
+ project = var.project_id
+ location = "global"

+ feature = google_gke_hub_feature.config_feature.name
+ membership = module.gke.fleet_membership
+ membership_location = module.gke.region

+ configmanagement {
+ config_sync {
+ enabled = true
+ git {
+ sync_repo = "[email protected]:GoogleCloudPlatform/anthos-config-management-samples.git"
+ sync_branch = "1.0.0"
+ policy_dir = "foo-corp"
+ }
+ }
+ }
+}

# Policy Controller
+resource "google_gke_hub_feature" "poco_feature" {
+ name = "policycontroller"
+ project = var.project_id
+ location = "global"
+}
+
+resource "google_gke_hub_feature_membership" "poco_feature_membership" {
+ project = var.project_id
+ location = "global"
+
+ feature = google_gke_hub_feature.poco_feature.name
+ membership = module.gke.fleet_membership
+ membership_location = module.gke.region
+
+ policycontroller {
+ policy_controller_hub_config {
+ install_spec = "INSTALL_SPEC_ENABLED"
+ policy_content {
+ template_library {
+ installation = "ALL"
+ }
+ bundles {
+ bundle_name = "pss-baseline-v2022"
+ }
+ }
+ referential_rules_enabled = true
+ }
+ }
+}
```
67 changes: 0 additions & 67 deletions examples/simple_zonal_with_acm/README.md

This file was deleted.

36 changes: 0 additions & 36 deletions examples/simple_zonal_with_acm/acm.tf

This file was deleted.

61 changes: 0 additions & 61 deletions examples/simple_zonal_with_acm/main.tf

This file was deleted.

45 changes: 0 additions & 45 deletions examples/simple_zonal_with_acm/network.tf

This file was deleted.

Loading

0 comments on commit 8709e6a

Please sign in to comment.