fix diff suppression for resource quantities in pv and pvc (#1145)

Author: jrhouston

kubernetes/resource_kubernetes_persistent_volume.go

@@ -96,11 +96,12 @@ func resourceKubernetesPersistentVolume() *schema.Resource {
 							Set: schema.HashString,
 						},
 						"capacity": {
-							Type:         schema.TypeMap,
-							Description:  "A description of the persistent volume's resources and capacity. More info: http://kubernetes.io/docs/user-guide/persistent-volumes#capacity",
-							Required:     true,
-							Elem:         schema.TypeString,
-							ValidateFunc: validateResourceList,
+							Type:             schema.TypeMap,
+							Description:      "A description of the persistent volume's resources and capacity. More info: http://kubernetes.io/docs/user-guide/persistent-volumes#capacity",
+							Required:         true,
+							Elem:             schema.TypeString,
+							ValidateFunc:     validateResourceList,
+							DiffSuppressFunc: suppressEquivalentResourceQuantity,
 						},
 						"persistent_volume_reclaim_policy": {
 							Type:        schema.TypeString,

kubernetes/schema_persistent_volume_claim.go

@@ -45,16 +45,18 @@ func persistentVolumeClaimSpecFields() map[string]*schema.Schema {
 			Elem: &schema.Resource{
 				Schema: map[string]*schema.Schema{
 					"limits": {
-						Type:        schema.TypeMap,
-						Description: "Map describing the maximum amount of compute resources allowed. More info: http://kubernetes.io/docs/user-guide/compute-resources/",
-						Optional:    true,
-						ForceNew:    true,
+						Type:             schema.TypeMap,
+						Description:      "Map describing the maximum amount of compute resources allowed. More info: http://kubernetes.io/docs/user-guide/compute-resources/",
+						Optional:         true,
+						ForceNew:         true,
+						DiffSuppressFunc: suppressEquivalentResourceQuantity,
 					},
 					// This is the only field the API will allow modifying in-place, so ForceNew is not used.
 					"requests": {
-						Type:        schema.TypeMap,
-						Description: "Map describing the minimum amount of compute resources required. If this is omitted for a container, it defaults to `limits` if that is explicitly specified, otherwise to an implementation-defined value. More info: http://kubernetes.io/docs/user-guide/compute-resources/",
-						Optional:    true,
+						Type:             schema.TypeMap,
+						Description:      "Map describing the minimum amount of compute resources required. If this is omitted for a container, it defaults to `limits` if that is explicitly specified, otherwise to an implementation-defined value. More info: http://kubernetes.io/docs/user-guide/compute-resources/",
+						Optional:         true,
+						DiffSuppressFunc: suppressEquivalentResourceQuantity,
 					},
 				},
 			},