Revert "Add support for reservation affinity, dataproc oss metric collection and node-group configs, also support 'SPOT' under preemptibility (#6889) (#4974)"

melinath · melinath · commit 99a8c0eb5c30 · 2022-12-19T09:13:56.000-08:00
This reverts commit 99bb678.
diff --git a/.changelog/6889.txt b/.changelog/6889.txt
diff --git a/google-beta/resource_dataproc_cluster.go b/google-beta/resource_dataproc_cluster.go
@@ -28,8 +28,6 @@ var (
 		"cluster_config.0.gce_cluster_config.0.internal_ip_only",
 		"cluster_config.0.gce_cluster_config.0.shielded_instance_config",
 		"cluster_config.0.gce_cluster_config.0.metadata",
-		"cluster_config.0.gce_cluster_config.0.reservation_affinity",
-		"cluster_config.0.gce_cluster_config.0.node_group_affinity",
 	}
 
 	schieldedInstanceConfigKeys = []string{
@@ -38,12 +36,6 @@ var (
 		"cluster_config.0.gce_cluster_config.0.shielded_instance_config.0.enable_integrity_monitoring",
 	}
 
-	reservationAffinityKeys = []string{
-		"cluster_config.0.gce_cluster_config.0.reservation_affinity.0.consume_reservation_type",
-		"cluster_config.0.gce_cluster_config.0.reservation_affinity.0.key",
-		"cluster_config.0.gce_cluster_config.0.reservation_affinity.0.values",
-	}
-
 	preemptibleWorkerDiskConfigKeys = []string{
 		"cluster_config.0.preemptible_worker_config.0.disk_config.0.num_local_ssds",
 		"cluster_config.0.preemptible_worker_config.0.disk_config.0.boot_disk_size_gb",
@@ -328,62 +320,6 @@ func resourceDataprocCluster() *schema.Resource {
 											},
 										},
 									},
-
-									"reservation_affinity": {
-										Type:         schema.TypeList,
-										Optional:     true,
-										AtLeastOneOf: gceClusterConfigKeys,
-										Computed:     true,
-										MaxItems:     1,
-										Description:  `Reservation Affinity for consuming Zonal reservation.`,
-										Elem: &schema.Resource{
-											Schema: map[string]*schema.Schema{
-												"consume_reservation_type": {
-													Type:         schema.TypeString,
-													Optional:     true,
-													AtLeastOneOf: reservationAffinityKeys,
-													ForceNew:     true,
-													ValidateFunc: validation.StringInSlice([]string{"NO_RESERVATION", "ANY_RESERVATION", "SPECIFIC_RESERVATION"}, false),
-													Description:  `Type of reservation to consume.`,
-												},
-												"key": {
-													Type:         schema.TypeString,
-													Optional:     true,
-													AtLeastOneOf: reservationAffinityKeys,
-													ForceNew:     true,
-													Description:  `Corresponds to the label key of reservation resource.`,
-												},
-												"values": {
-													Type:         schema.TypeSet,
-													Elem:         &schema.Schema{Type: schema.TypeString},
-													Optional:     true,
-													AtLeastOneOf: reservationAffinityKeys,
-													ForceNew:     true,
-													Description:  `Corresponds to the label values of reservation resource.`,
-												},
-											},
-										},
-									},
-
-									"node_group_affinity": {
-										Type:         schema.TypeList,
-										Optional:     true,
-										AtLeastOneOf: gceClusterConfigKeys,
-										Computed:     true,
-										MaxItems:     1,
-										Description:  `Node Group Affinity for sole-tenant clusters.`,
-										Elem: &schema.Resource{
-											Schema: map[string]*schema.Schema{
-												"node_group_uri": {
-													Type:             schema.TypeString,
-													ForceNew:         true,
-													Required:         true,
-													Description:      `The URI of a sole-tenant that the cluster will be created on.`,
-													DiffSuppressFunc: compareSelfLinkOrResourceName,
-												},
-											},
-										},
-									},
 								},
 							},
 						},
@@ -1129,26 +1065,6 @@ func expandGceClusterConfig(d *schema.ResourceData, config *Config) (*dataproc.G
 			conf.ShieldedInstanceConfig.EnableVtpm = v.(bool)
 		}
 	}
-	if v, ok := d.GetOk("cluster_config.0.gce_cluster_config.0.reservation_affinity"); ok {
-		cfgRa := v.([]interface{})[0].(map[string]interface{})
-		conf.ReservationAffinity = &dataproc.ReservationAffinity{}
-		if v, ok := cfgRa["consume_reservation_type"]; ok {
-			conf.ReservationAffinity.ConsumeReservationType = v.(string)
-		}
-		if v, ok := cfgRa["key"]; ok {
-			conf.ReservationAffinity.Key = v.(string)
-		}
-		if v, ok := cfgRa["values"]; ok {
-			conf.ReservationAffinity.Values = convertStringSet(v.(*schema.Set))
-		}
-	}
-	if v, ok := d.GetOk("cluster_config.0.gce_cluster_config.0.node_group_affinity"); ok {
-		cfgNga := v.([]interface{})[0].(map[string]interface{})
-		conf.NodeGroupAffinity = &dataproc.NodeGroupAffinity{}
-		if v, ok := cfgNga["node_group_uri"]; ok {
-			conf.NodeGroupAffinity.NodeGroupUri = v.(string)
-		}
-	}
 	return conf, nil
 }
 
@@ -1732,22 +1648,6 @@ func flattenGceClusterConfig(d *schema.ResourceData, gcc *dataproc.GceClusterCon
 			},
 		}
 	}
-	if gcc.ReservationAffinity != nil {
-		gceConfig["reservation_affinity"] = []map[string]interface{}{
-			{
-				"consume_reservation_type": gcc.ReservationAffinity.ConsumeReservationType,
-				"key":                      gcc.ReservationAffinity.Key,
-				"values":                   gcc.ReservationAffinity.Values,
-			},
-		}
-	}
-	if gcc.NodeGroupAffinity != nil {
-		gceConfig["node_group_affinity"] = []map[string]interface{}{
-			{
-				"node_group_uri": gcc.NodeGroupAffinity.NodeGroupUri,
-			},
-		}
-	}
 
 	return []map[string]interface{}{gceConfig}
 }
diff --git a/google-beta/resource_dataproc_cluster_test.go b/google-beta/resource_dataproc_cluster_test.go
@@ -328,52 +328,6 @@ func TestAccDataprocCluster_withMetadataAndTags(t *testing.T) {
 	})
 }
 
-func TestAccDataprocCluster_withReservationAffinity(t *testing.T) {
-	t.Parallel()
-
-	var cluster dataproc.Cluster
-	rnd := randString(t, 10)
-	vcrTest(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckDataprocClusterDestroy(t),
-		Steps: []resource.TestStep{
-			{
-				Config: testAccDataprocCluster_withReservationAffinity(rnd),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckDataprocClusterExists(t, "google_dataproc_cluster.basic", &cluster),
-
-					resource.TestCheckResourceAttr("google_dataproc_cluster.basic", "cluster_config.0.gce_cluster_config.0.reservation_affinity.0.consume_reservation_type", "SPECIFIC_RESERVATION"),
-					resource.TestCheckResourceAttr("google_dataproc_cluster.basic", "cluster_config.0.gce_cluster_config.0.reservation_affinity.0.key", "compute.googleapis.com/reservation-name"),
-					resource.TestCheckResourceAttr("google_dataproc_cluster.basic", "cluster_config.0.gce_cluster_config.0.reservation_affinity.0.values.#", "1"),
-				),
-			},
-		},
-	})
-}
-
-func TestAccDataprocCluster_withNodeGroupAffinity(t *testing.T) {
-	t.Parallel()
-
-	var cluster dataproc.Cluster
-	rnd := randString(t, 10)
-	vcrTest(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckDataprocClusterDestroy(t),
-		Steps: []resource.TestStep{
-			{
-				Config: testAccDataprocCluster_withNodeGroupAffinity(rnd),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckDataprocClusterExists(t, "google_dataproc_cluster.basic", &cluster),
-
-					resource.TestCheckResourceAttr("google_dataproc_cluster.basic", "cluster_config.0.gce_cluster_config.0.node_group_affinity.0.node_group_uri", "https://www.googleapis.com/compute/v1/projects/ci-test-project-188019/zones/us-central1-f/nodeGroups/test-nodegroup"),
-				),
-			},
-		},
-	})
-}
-
 func TestAccDataprocCluster_singleNodeCluster(t *testing.T) {
 	t.Parallel()
 
@@ -1255,89 +1209,6 @@ resource "google_dataproc_cluster" "basic" {
 `, rnd)
 }
 
-func testAccDataprocCluster_withReservationAffinity(rnd string) string {
-	return fmt.Sprintf(`
-
-resource "google_compute_reservation" "reservation" {
-  name = "default"
-  zone = "us-central1-f"
-
-  specific_reservation {
-    count = 10
-    instance_properties {
-      machine_type = "n1-standard-2"
-    }
-  }
-  specific_reservation_required = true
-}
-
-resource "google_dataproc_cluster" "basic" {
-  name   = "tf-test-dproc-%s"
-  region = "us-central1"
-
-  cluster_config {
-
-    master_config {
-      machine_type  = "n1-standard-2"
-    }
-
-    worker_config {
-      machine_type  = "n1-standard-2"
-    }
-
-    gce_cluster_config {
-      zone = "us-central1-f"
-      reservation_affinity {      
-        consume_reservation_type = "SPECIFIC_RESERVATION"
-        key = "compute.googleapis.com/reservation-name"
-        values = [google_compute_reservation.reservation.name]
-      }
-    }
-  }
-}
-`, rnd)
-}
-
-func testAccDataprocCluster_withNodeGroupAffinity(rnd string) string {
-	return fmt.Sprintf(`
-
-resource "google_compute_node_template" "nodetmpl" {
-  name   = "test-nodetmpl"
-  region = "us-central1"
-
-  node_affinity_labels = {
-    tfacc = "test"
-  }
-
-  node_type = "n1-node-96-624"
-
-  cpu_overcommit_type = "ENABLED"
-}
-
-resource "google_compute_node_group" "nodes" {
-  name = "test-nodegroup"
-  zone = "us-central1-f"
-
-  size          = 3
-  node_template = google_compute_node_template.nodetmpl.self_link
-}
-
-resource "google_dataproc_cluster" "basic" {
-  name   = "tf-test-dproc-%s"
-  region = "us-central1"
-
-  cluster_config {
-    gce_cluster_config {
-      zone = "us-central1-f"
-      node_group_affinity {
-        node_group_uri = google_compute_node_group.nodes.name
-      }
-    }
-  }
-}
-`, rnd)
-}
-
 func testAccDataprocCluster_singleNodeCluster(rnd string) string {
 	return fmt.Sprintf(`
 resource "google_dataproc_cluster" "single_node_cluster" {
diff --git a/website/docs/r/dataproc_cluster.html.markdown b/website/docs/r/dataproc_cluster.html.markdown
@@ -372,14 +372,6 @@ resource "google_dataproc_cluster" "accelerated_cluster" {
 * `endpoint_config` (Optional) The config settings for port access on the cluster.
    Structure [defined below](#nested_endpoint_config).
 
-* `dataproc_metric_config` (Optional) The Compute Engine accelerator (GPU) configuration for these instances. Can be specified multiple times.
-
-    * `metrics` - (Required) Metrics sources to enable.
-
-        * `metric_source` - (Required) A source for the collection of Dataproc OSS metrics (see [available OSS metrics](https://cloud.google.com//dataproc/docs/guides/monitoring#available_oss_metrics)).
-
-        * `metric_overrides` - (Optional) One or more [available OSS metrics] (https://cloud.google.com/dataproc/docs/guides/monitoring#available_oss_metrics) to collect for the metric course.
-
 * `metastore_config` (Optional) The config setting for metastore service with the cluster.
    Structure [defined below](#nested_metastore_config).
 - - -
@@ -436,14 +428,6 @@ resource "google_dataproc_cluster" "accelerated_cluster" {
 * `metadata` - (Optional) A map of the Compute Engine metadata entries to add to all instances
    (see [Project and instance metadata](https://cloud.google.com/compute/docs/storing-retrieving-metadata#project_and_instance_metadata)).
 
-* `reservation_affinity` - (Optional) Reservation Affinity for consuming Zonal reservation.
-    * `consume_reservation_type` - (Optional) Metrics sources to enable.
-    * `key` - (Optional) Corresponds to the label key of reservation resource.
-    * `values` - (Optional) Corresponds to the label values of reservation resource.
-
-* `node_group_affinity` - (Optional) The name of the sole-tenant node group to create the cluster on.
-    * `node_group_uri` - (Required) The URI of a sole-tenant node group resource that the cluster will be created on.
-
 * `shielded_instance_config` (Optional) Shielded Instance Config for clusters using [Compute Engine Shielded VMs](https://cloud.google.com/security/shielded-cloud/shielded-vm).
 
 - - -
@@ -620,7 +604,6 @@ will be set for you based on whatever was set for the `worker_config.machine_typ
   * PREEMPTIBILITY_UNSPECIFIED
   * NON_PREEMPTIBLE
   * PREEMPTIBLE
-  * SPOT
 
 * `disk_config` (Optional) Disk Config
 
