Adding update support for labels to google_container_node_pool (#6599) (

#4781) Signed-off-by: Modular Magician <[email protected]> Signed-off-by: Modular Magician <[email protected]>
hashicorp · Oct 12, 2022 · da44db3 · da44db3
1 parent 91dacbd
commit da44db3
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 1 deletion.
diff --git a/.changelog/6599.txt b/.changelog/6599.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+container: added support for in-place update of `node_config.0.tags` for `google_container_node_pool` resource
+```
diff --git a/google-beta/node_config.go b/google-beta/node_config.go
@@ -290,7 +290,6 @@ func schemaNodeConfig() *schema.Schema {
 				"tags": {
 					Type:        schema.TypeList,
 					Optional:    true,
-					ForceNew:    true,
 					Elem:        &schema.Schema{Type: schema.TypeString},
 					Description: `The list of instance tags applied to all nodes.`,
 				},

diff --git a/google-beta/resource_container_node_pool.go b/google-beta/resource_container_node_pool.go
@@ -1015,6 +1015,61 @@ func nodePoolUpdate(d *schema.ResourceData, meta interface{}, nodePoolInfo *Node
 	}
 
 	if d.HasChange(prefix + "node_config") {
+
+		if d.HasChange(prefix + "node_config.0.tags") {
+			req := &container.UpdateNodePoolRequest{
+				Name: name,
+			}
+			if v, ok := d.GetOk(prefix + "node_config.0.tags"); ok {
+				tagsList := v.([]interface{})
+				tags := []string{}
+				for _, v := range tagsList {
+					if v != nil {
+						tags = append(tags, v.(string))
+					}
+				}
+				ntags := &container.NetworkTags{
+					Tags: tags,
+				}
+				req.Tags = ntags
+			}
+
+			// sets tags to the empty list when user removes a previously defined list of tags entriely
+			// aka the node pool goes from having tags to no longer having any
+			if req.Tags == nil {
+				tags := []string{}
+				ntags := &container.NetworkTags{
+					Tags: tags,
+				}
+				req.Tags = ntags
+			}
+
+			updateF := func() error {
+				clusterNodePoolsUpdateCall := config.NewContainerClient(userAgent).Projects.Locations.Clusters.NodePools.Update(nodePoolInfo.fullyQualifiedName(name), req)
+				if config.UserProjectOverride {
+					clusterNodePoolsUpdateCall.Header().Add("X-Goog-User-Project", nodePoolInfo.project)
+				}
+				op, err := clusterNodePoolsUpdateCall.Do()
+				if err != nil {
+					return err
+				}
+
+				// Wait until it's updated
+				return containerOperationWait(config, op,
+					nodePoolInfo.project,
+					nodePoolInfo.location,
+					"updating GKE node pool tags", userAgent,
+					timeout)
+			}
+
+			// Call update serially.
+			if err := lockedCall(lockKey, updateF); err != nil {
+				return err
+			}
+
+			log.Printf("[INFO] Updated tags for node pool %s", name)
+		}
+
 		if d.HasChange(prefix + "node_config.0.image_type") {
 			req := &container.UpdateClusterRequest{
 				Update: &container.ClusterUpdate{

diff --git a/google-beta/resource_container_node_pool_test.go b/google-beta/resource_container_node_pool_test.go
@@ -1645,6 +1645,8 @@ resource "google_container_node_pool" "np_with_node_config" {
     ]
     preemptible      = true
     min_cpu_platform = "Intel Broadwell"
+	
+    tags = ["ga"]
 
     taint {
       key    = "taint_key"
@@ -1690,6 +1692,8 @@ resource "google_container_node_pool" "np_with_node_config" {
     preemptible      = true
     min_cpu_platform = "Intel Broadwell"
 
+    tags = ["beta"]
+
     taint {
       key    = "taint_key"
       value  = "taint_value"