Add DSF on resource_labels in node_config (#12877)

Author: slevenick

mmv1/third_party/terraform/services/container/node_config.go.tmpl

@@ -2,9 +2,7 @@ package container
 
 import (
 	"log"
-{{- if ne $.TargetVersionName "ga" }}
 	"strings"
-{{- end }}
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -241,10 +239,11 @@ func schemaNodeConfig() *schema.Schema {
 				},
 
 				"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.`,
+					Type:             schema.TypeMap,
+					Optional:         true,
+					Elem:             &schema.Schema{Type: schema.TypeString},
+					DiffSuppressFunc: containerNodePoolResourceLabelsDiffSuppress,
+					Description:      `The GCE resource labels (a map of key/value pairs) to be applied to the node pool.`,
 				},
 
 				"local_ssd_count": {
@@ -1869,6 +1868,21 @@ func containerNodePoolLabelsSuppress(k, old, new string, d *schema.ResourceData)
 }
 {{- end }}
 
+func containerNodePoolResourceLabelsDiffSuppress(k, old, new string, d *schema.ResourceData) bool {
+	// Suppress diffs for server-specified labels prefixed with "goog-gke"
+	if strings.Contains(k, "resource_labels.goog-gke") && new == "" {
+		return true
+	}
+
+	// Let diff be determined by resource_labels (above)
+	if strings.Contains(k, "resource_labels.%") {
+		return true
+	}
+
+	// For other keys, don't suppress diff.
+	return false
+}
+
 func flattenKubeletConfig(c *container.NodeKubeletConfig) []map[string]interface{} {
 	result := []map[string]interface{}{}
 	if c != nil {