feat(google_container_cluster): add resource_labels to node_config (#…

…6842) (#13104) Fixes #13064 Signed-off-by: Modular Magician <magic-modules@google.com> Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Nov 22, 2022 · 0ee63a8 · 0ee63a8
1 parent 9dfb774
commit 0ee63a8
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 0 deletions.
diff --git a/.changelog/6842.txt b/.changelog/6842.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+container: added `resource_labels` field to `node_config` resource
+```
diff --git a/google/node_config.go b/google/node_config.go
@@ -149,6 +149,13 @@ func schemaNodeConfig() *schema.Schema {
 					Description: `The map of Kubernetes labels (key/value pairs) to be applied to each node. These will added in addition to any default label(s) that Kubernetes may apply to the node.`,
 				},
 
+				"resource_labels": {
+					Type:        schema.TypeMap,
+					Optional:    true,
+					Elem:        &schema.Schema{Type: schema.TypeString},
+					Description: `The GCE resource labels (a map of key/value pairs) to be applied to the node pool.`,
+				},
+
 				"local_ssd_count": {
 					Type:         schema.TypeInt,
 					Optional:     true,
@@ -525,6 +532,14 @@ func expandNodeConfig(v interface{}) *container.NodeConfig {
 		nc.Labels = m
 	}
 
+	if v, ok := nodeConfig["resource_labels"]; ok {
+		m := make(map[string]string)
+		for k, val := range v.(map[string]interface{}) {
+			m[k] = val.(string)
+		}
+		nc.ResourceLabels = m
+	}
+
 	if v, ok := nodeConfig["tags"]; ok {
 		tagsList := v.([]interface{})
 		tags := []string{}
@@ -638,6 +653,7 @@ func flattenNodeConfig(c *container.NodeConfig) []map[string]interface{} {
 		"metadata":                 c.Metadata,
 		"image_type":               c.ImageType,
 		"labels":                   c.Labels,
+		"resource_labels":          c.ResourceLabels,
 		"tags":                     c.Tags,
 		"preemptible":              c.Preemptible,
 		"spot":                     c.Spot,

diff --git a/google/resource_container_node_pool.go b/google/resource_container_node_pool.go
@@ -1143,6 +1143,44 @@ func nodePoolUpdate(d *schema.ResourceData, meta interface{}, nodePoolInfo *Node
 			log.Printf("[INFO] Updated tags for node pool %s", name)
 		}
 
+		if d.HasChange(prefix + "node_config.0.resource_labels") {
+			req := &container.UpdateNodePoolRequest{
+				Name: name,
+			}
+
+			if v, ok := d.GetOk(prefix + "node_config.0.resource_labels"); ok {
+				resourceLabels := v.(map[string]interface{})
+				req.ResourceLabels = &container.ResourceLabels{
+					Labels: convertStringMap(resourceLabels),
+				}
+			}
+
+			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 resource labels", userAgent,
+					timeout)
+			}
+
+			// Call update serially.
+			if err := lockedCall(lockKey, updateF); err != nil {
+				return err
+			}
+
+			log.Printf("[INFO] Updated resource labels for node pool %s", name)
+		}
+
 		if d.HasChange(prefix + "node_config.0.image_type") {
 			req := &container.UpdateClusterRequest{
 				Update: &container.ClusterUpdate{

diff --git a/google/resource_container_node_pool_test.go b/google/resource_container_node_pool_test.go
@@ -1427,6 +1427,10 @@ resource "google_container_node_pool" "np_with_node_config" {
 	
     tags = ["ga"]
 
+	resource_labels = {
+      "key1" = "value"
+    }
+
     taint {
       key    = "taint_key"
       value  = "taint_value"
@@ -1473,6 +1477,11 @@ resource "google_container_node_pool" "np_with_node_config" {
 
     tags = ["beta"]
 
+	resource_labels = {
+      "key1" = "value1"
+	  "key2" = "value2"
+    }
+
     taint {
       key    = "taint_key"
       value  = "taint_value"

diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown
@@ -750,6 +750,9 @@ gvnic {
 * `labels` - (Optional) The Kubernetes labels (key/value pairs) to be applied to each node. The kubernetes.io/ and k8s.io/ prefixes are
     reserved by Kubernetes Core components and cannot be specified.
 
+* `resource_labels` - (Optional) The GCP labels (key/value pairs) to be applied to each node. Refer [here](https://cloud.google.com/kubernetes-engine/docs/how-to/creating-managing-labels)
+    for how these labels are applied to clusters, node pools and nodes.
+
 * `local_ssd_count` - (Optional) The amount of local SSD disks that will be
     attached to each cluster node. Defaults to 0.