Graduate support of GKE Compact Placement to GA

GoogleCloudPlatform · Dec 23, 2022 · 19876d5 · 19876d5
1 parent b40e53f
commit 19876d5
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/mmv1/third_party/terraform/resources/resource_container_node_pool.go.erb b/mmv1/third_party/terraform/resources/resource_container_node_pool.go.erb
@@ -173,7 +173,6 @@ var schemaNodePool = map[string]*schema.Schema{
 		},
 	},
 
-<% unless version == 'ga' -%>
 	"placement_policy": {
 		Type:        schema.TypeList,
 		Optional:    true,
@@ -190,7 +189,6 @@ var schemaNodePool = map[string]*schema.Schema{
 			},
 		},
 	},
-<% end -%>
 
 	"max_pods_per_node": &schema.Schema{
 		Type:        schema.TypeInt,
@@ -852,14 +850,12 @@ func expandNodePool(d *schema.ResourceData, prefix string) (*container.NodePool,
 		}
 	}
 
- <% unless version == 'ga' -%>
 	if v, ok := d.GetOk(prefix + "placement_policy"); ok {
 		placement_policy := v.([]interface{})[0].(map[string]interface{})
 		np.PlacementPolicy = &container.PlacementPolicy{
 			Type: placement_policy["type"].(string),
 		}
 	}
-<% end -%>
 
 	if v, ok := d.GetOk(prefix + "max_pods_per_node"); ok {
 		np.MaxPodsConstraint = &container.MaxPodsConstraint{
@@ -1044,15 +1040,13 @@ func flattenNodePool(d *schema.ResourceData, config *Config, np *container.NodeP
 		}
 	}
 
-<% unless version == 'ga' -%>
 	if np.PlacementPolicy != nil {
 		nodePool["placement_policy"] = []map[string]interface{}{
 			{
 				"type": np.PlacementPolicy.Type,
 			},
 		}
 	}
-<% end -%>
 
 	if np.MaxPodsConstraint != nil {
 		nodePool["max_pods_per_node"] = np.MaxPodsConstraint.MaxPodsPerNode

diff --git a/mmv1/third_party/terraform/tests/resource_container_node_pool_test.go.erb b/mmv1/third_party/terraform/tests/resource_container_node_pool_test.go.erb
@@ -1343,7 +1343,6 @@ resource "google_container_node_pool" "np" {
 `, cluster, np)
 }
 
-<% unless version == 'ga' -%>
 func TestAccContainerNodePool_compactPlacement(t *testing.T) {
 	t.Parallel()
 
@@ -1390,7 +1389,6 @@ resource "google_container_node_pool" "np" {
 }
 `, cluster, np, placementType)
 }
-<% end -%>
 
 func testAccCheckContainerNodePoolDestroyProducer(t *testing.T) func(s *terraform.State) error {
 	return func(s *terraform.State) error {

diff --git a/mmv1/third_party/terraform/website/docs/r/container_node_pool.html.markdown b/mmv1/third_party/terraform/website/docs/r/container_node_pool.html.markdown
@@ -168,7 +168,7 @@ cluster.
     when fuzzy versions are used. See the `google_container_engine_versions` data source's
     `version_prefix` field to approximate fuzzy versions in a Terraform-compatible way.
 
-* `placement_policy` - (Optional, [Beta](https://terraform.io/docs/providers/google/provider_versions.html)) Specifies a custom placement policy for the
+* `placement_policy` - (Optional) Specifies a custom placement policy for the
   nodes.
 
 <a name="nested_autoscaling"></a>The `autoscaling` block supports (either total or per zone limits are required):