Skip to content

Commit c499ac8

Browse files
Promote workloadPolicy and groupPlacementPolicy.gpuTopology to GA (#14194) (#10173)
[upstream:db8ad22c19afd6d744772e90d11524838b6884e4] Signed-off-by: Modular Magician <[email protected]>
1 parent a935328 commit c499ac8

File tree

3 files changed

+9
-14
lines changed

3 files changed

+9
-14
lines changed

.changelog/14194.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
compute: added `workload_policy` and `group_placement_policy.gpu_topology` fields to `google_compute_resource_policy` resource (ga)
3+
```

google-beta/services/compute/resource_compute_resource_policy_generated_test.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ func TestAccComputeResourcePolicy_resourcePolicyWorkloadPolicyExample(t *testing
390390

391391
acctest.VcrTest(t, resource.TestCase{
392392
PreCheck: func() { acctest.AccTestPreCheck(t) },
393-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
393+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
394394
CheckDestroy: testAccCheckComputeResourcePolicyDestroyProducer(t),
395395
Steps: []resource.TestStep{
396396
{
@@ -411,7 +411,6 @@ func testAccComputeResourcePolicy_resourcePolicyWorkloadPolicyExample(context ma
411411
resource "google_compute_resource_policy" "bar" {
412412
name = "tf-test-gce-policy%{random_suffix}"
413413
region = "europe-west1"
414-
provider = google-beta
415414
workload_policy {
416415
type = "HIGH_AVAILABILITY"
417416
}
@@ -428,7 +427,7 @@ func TestAccComputeResourcePolicy_resourcePolicyWorkloadPolicyAcceleratorTopolog
428427

429428
acctest.VcrTest(t, resource.TestCase{
430429
PreCheck: func() { acctest.AccTestPreCheck(t) },
431-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
430+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
432431
CheckDestroy: testAccCheckComputeResourcePolicyDestroyProducer(t),
433432
Steps: []resource.TestStep{
434433
{
@@ -449,7 +448,6 @@ func testAccComputeResourcePolicy_resourcePolicyWorkloadPolicyAcceleratorTopolog
449448
resource "google_compute_resource_policy" "bar" {
450449
name = "tf-test-gce-policy%{random_suffix}"
451450
region = "europe-west1"
452-
provider = google-beta
453451
workload_policy {
454452
type = "HIGH_THROUGHPUT"
455453
accelerator_topology = "SOME NEW TOPOLOGY"
@@ -467,7 +465,7 @@ func TestAccComputeResourcePolicy_resourcePolicyWorkloadPolicyMaxTopologyDistanc
467465

468466
acctest.VcrTest(t, resource.TestCase{
469467
PreCheck: func() { acctest.AccTestPreCheck(t) },
470-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
468+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
471469
CheckDestroy: testAccCheckComputeResourcePolicyDestroyProducer(t),
472470
Steps: []resource.TestStep{
473471
{
@@ -488,7 +486,6 @@ func testAccComputeResourcePolicy_resourcePolicyWorkloadPolicyMaxTopologyDistanc
488486
resource "google_compute_resource_policy" "bar" {
489487
name = "tf-test-gce-policy%{random_suffix}"
490488
region = "europe-west1"
491-
provider = google-beta
492489
workload_policy {
493490
type = "HIGH_THROUGHPUT"
494491
max_topology_distance = "BLOCK"
@@ -506,7 +503,7 @@ func TestAccComputeResourcePolicy_resourcePolicyPlacementPolicyGpuTopologyExampl
506503

507504
acctest.VcrTest(t, resource.TestCase{
508505
PreCheck: func() { acctest.AccTestPreCheck(t) },
509-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
506+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
510507
CheckDestroy: testAccCheckComputeResourcePolicyDestroyProducer(t),
511508
Steps: []resource.TestStep{
512509
{
@@ -525,7 +522,6 @@ func TestAccComputeResourcePolicy_resourcePolicyPlacementPolicyGpuTopologyExampl
525522
func testAccComputeResourcePolicy_resourcePolicyPlacementPolicyGpuTopologyExample(context map[string]interface{}) string {
526523
return acctest.Nprintf(`
527524
resource "google_compute_resource_policy" "baz" {
528-
provider = google-beta
529525
name = "tf-test-gce-policy%{random_suffix}"
530526
region = "europe-west9"
531527
group_placement_policy {

website/docs/r/compute_resource_policy.html.markdown

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ resource "google_compute_resource_policy" "cgroup" {
209209
resource "google_compute_resource_policy" "bar" {
210210
name = "gce-policy"
211211
region = "europe-west1"
212-
provider = google-beta
213212
workload_policy {
214213
type = "HIGH_AVAILABILITY"
215214
}
@@ -227,7 +226,6 @@ resource "google_compute_resource_policy" "bar" {
227226
resource "google_compute_resource_policy" "bar" {
228227
name = "gce-policy"
229228
region = "europe-west1"
230-
provider = google-beta
231229
workload_policy {
232230
type = "HIGH_THROUGHPUT"
233231
accelerator_topology = "SOME NEW TOPOLOGY"
@@ -246,7 +244,6 @@ resource "google_compute_resource_policy" "bar" {
246244
resource "google_compute_resource_policy" "bar" {
247245
name = "gce-policy"
248246
region = "europe-west1"
249-
provider = google-beta
250247
workload_policy {
251248
type = "HIGH_THROUGHPUT"
252249
max_topology_distance = "BLOCK"
@@ -263,7 +260,6 @@ resource "google_compute_resource_policy" "bar" {
263260

264261
```hcl
265262
resource "google_compute_resource_policy" "baz" {
266-
provider = google-beta
267263
name = "gce-policy"
268264
region = "europe-west9"
269265
group_placement_policy {
@@ -337,7 +333,7 @@ The following arguments are supported:
337333
Structure is [documented below](#nested_disk_consistency_group_policy).
338334

339335
* `workload_policy` -
340-
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
336+
(Optional)
341337
Represents the workload policy.
342338
Structure is [documented below](#nested_workload_policy).
343339

@@ -489,7 +485,7 @@ The following arguments are supported:
489485
Specifies the number of max logical switches.
490486

491487
* `gpu_topology` -
492-
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
488+
(Optional)
493489
Specifies the shape of the GPU slice, in slice based GPU families eg. A4X.
494490

495491
* `tpu_topology` -

0 commit comments

Comments
 (0)