Mark Workload Identity as GA fully. (#3941) (#2458)

* mark workload identity as ga in docs * remove beta blocks from workload_metadata_config * fix errors in tests Signed-off-by: Modular Magician <[email protected]>
hashicorp · Sep 3, 2020 · 02c04b5 · 02c04b5
1 parent 5c20122
commit 02c04b5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.changelog/3941.txt b/.changelog/3941.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+container: marked `workload_metadata_config` as GA in `google_container_node_pool`
+```
diff --git a/google-beta/node_config.go b/google-beta/node_config.go
@@ -569,7 +569,6 @@ func flattenWorkloadMetadataConfig(c *containerBeta.WorkloadMetadataConfig) []ma
 	}
 	return result
 }
-
 func flattenSandboxConfig(c *containerBeta.SandboxConfig) []map[string]interface{} {
 	result := []map[string]interface{}{}
 	if c != nil {

diff --git a/google-beta/resource_container_node_pool.go b/google-beta/resource_container_node_pool.go
@@ -761,6 +761,7 @@ func nodePoolUpdate(d *schema.ResourceData, meta interface{}, nodePoolInfo *Node
 
 			log.Printf("[INFO] Updated image type in Node Pool %s", d.Id())
 		}
+
 		if d.HasChange(prefix + "node_config.0.workload_metadata_config") {
 			req := &containerBeta.UpdateNodePoolRequest{
 				NodePoolId: name,

diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown
@@ -311,7 +311,7 @@ subnetwork in which the cluster's instances are launched.
     Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it.
     Structure is documented below.
 
-* `workload_identity_config` - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
+* `workload_identity_config` - (Optional)
     Workload Identity allows Kubernetes service accounts to act as a user-managed
     [Google IAM Service Account](https://cloud.google.com/iam/docs/service-accounts#user-managed_service_accounts).
     Structure is documented below.
@@ -634,7 +634,7 @@ Kubernetes (eg. through `kubectl`), and it's recommended that you do not use
 this field to manage taints. If you do, `lifecycle.ignore_changes` is
 recommended. Structure is documented below.
 
-* `workload_metadata_config` - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)) Metadata configuration to expose to workloads on the node pool.
+* `workload_metadata_config` - (Optional) Metadata configuration to expose to workloads on the node pool.
     Structure is documented below.
 
 * `kubelet_config` - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))