Skip to content

Commit 8e982f5

Browse files
authored
Marked osconfigv2_policy_orchestrator example as beta-only (#15033)
1 parent c02ebf9 commit 8e982f5

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

mmv1/products/osconfigv2/PolicyOrchestratorForFolder.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ examples:
4141
zone: 'ZONE'
4242
external_providers:
4343
- "time"
44+
min_version: beta
4445
autogen_async: true
4546
async:
4647
operation:

mmv1/templates/terraform/examples/osconfigv2_policy_orchestrator_for_folder_basic.tf.tmpl

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
resource "google_folder" "my_folder" {
2+
provider = google-beta
23
display_name = "{{index $.Vars "folder"}}"
34
parent = "organizations/{{index $.TestEnvVars "org_id"}}"
45
deletion_protection = false
56
}
67

78
resource "google_folder_service_identity" "osconfig_sa" {
8-
folder = google_folder.my_folder.folder_id
9-
service = "osconfig.googleapis.com"
9+
provider = google-beta
10+
folder = google_folder.my_folder.folder_id
11+
service = "osconfig.googleapis.com"
1012
}
1113

1214
resource "google_folder_service_identity" "ripple_sa" {
13-
folder = google_folder.my_folder.folder_id
14-
service = "progressiverollout.googleapis.com"
15+
provider = google-beta
16+
folder = google_folder.my_folder.folder_id
17+
service = "progressiverollout.googleapis.com"
1518
}
1619

1720
resource "time_sleep" "wait_30_sec" {
@@ -23,20 +26,23 @@ resource "time_sleep" "wait_30_sec" {
2326
}
2427

2528
resource "google_folder_iam_member" "iam_osconfig_service_agent" {
29+
provider = google-beta
2630
depends_on = [time_sleep.wait_30_sec]
2731
folder = google_folder.my_folder.folder_id
2832
role = "roles/osconfig.serviceAgent"
2933
member = google_folder_service_identity.osconfig_sa.member
3034
}
3135

3236
resource "google_folder_iam_member" "iam_osconfig_rollout_service_agent" {
37+
provider = google-beta
3338
depends_on = [google_folder_iam_member.iam_osconfig_service_agent]
3439
folder = google_folder.my_folder.folder_id
3540
role = "roles/osconfig.rolloutServiceAgent"
3641
member = "serviceAccount:service-folder-${google_folder.my_folder.folder_id}@gcp-sa-osconfig-rollout.iam.gserviceaccount.com"
3742
}
3843

3944
resource "google_folder_iam_member" "iam_progressiverollout_service_agent" {
45+
provider = google-beta
4046
depends_on = [google_folder_iam_member.iam_osconfig_rollout_service_agent]
4147
folder = google_folder.my_folder.folder_id
4248
role = "roles/progressiverollout.serviceAgent"
@@ -49,6 +55,7 @@ resource "time_sleep" "wait_3_min" {
4955
}
5056

5157
resource "google_os_config_v2_policy_orchestrator_for_folder" "{{$.PrimaryResourceId}}" {
58+
provider = google-beta
5259
depends_on = [time_sleep.wait_3_min]
5360

5461
policy_orchestrator_id = "{{index $.Vars "policy_orchestrator_id"}}"

0 commit comments

Comments
 (0)