Allow defining empty taint, remove old DSF (#2537)

third_party/terraform/utils/node_config.go.erb

@@ -178,7 +178,9 @@ var schemaNodeConfig = &schema.Schema{
 				// Computed=true because GKE Sandbox will automatically add taints to nodes that can/cannot run sandboxed pods.
 				Computed:         true,
 				ForceNew:         true,
-				DiffSuppressFunc: taintDiffSuppress,
+				// Legacy config mode allows explicitly defining an empty taint.
+				// See https://www.terraform.io/docs/configuration/attr-as-blocks.html
+				ConfigMode: schema.SchemaConfigModeAttr,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"key": {
@@ -469,20 +471,3 @@ func flattenSandboxConfig(c *containerBeta.SandboxConfig) []map[string]interface
 	return result
 }
 <% end -%>
-
-func taintDiffSuppress(k, old, new string, d *schema.ResourceData) bool {
-	if strings.HasSuffix(k, "#") {
-		oldCount, oldErr := strconv.Atoi(old)
-		newCount, newErr := strconv.Atoi(new)
-		// If either of them isn't a number somehow, or if there's one that we didn't have before.
-		return oldErr != nil || newErr != nil || oldCount == newCount+1
-	} else {
-		lastDot := strings.LastIndex(k, ".")
-		taintKey := d.Get(k[:lastDot] + ".key").(string)
-		if taintKey == "nvidia.com/gpu" {
-			return true
-		} else {
-			return false
-		}
-	}
-}