Skip to content

Commit 1f6e09c

Browse files
Force send internal_ip_only (#11923) (#8363)
[upstream:991966b4652bc7d10cc7545349f33b2a0fceed2a] Signed-off-by: Modular Magician <[email protected]>
1 parent 7ef4c74 commit 1f6e09c

File tree

4 files changed

+16
-0
lines changed

4 files changed

+16
-0
lines changed

Diff for: .changelog/11923.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
dataproc: fixed a bug in `google_dataproc_cluster` that prevented creation of clusters with `internal_ip_only` set to false
3+
```

Diff for: google-beta/services/dataproc/resource_dataproc_cluster.go

+1
Original file line numberDiff line numberDiff line change
@@ -2179,6 +2179,7 @@ func expandGceClusterConfig(d *schema.ResourceData, config *transport_tpg.Config
21792179
}
21802180
if v, ok := cfg["internal_ip_only"]; ok {
21812181
conf.InternalIpOnly = v.(bool)
2182+
conf.ForceSendFields = append(conf.ForceSendFields, "InternalIpOnly")
21822183
}
21832184
if v, ok := cfg["metadata"]; ok {
21842185
conf.Metadata = tpgresource.ConvertStringMap(v.(map[string]interface{}))

Diff for: google-beta/services/dataproc/resource_dataproc_cluster_test.go

+11
Original file line numberDiff line numberDiff line change
@@ -1416,6 +1416,10 @@ resource "google_dataproc_cluster" "accelerated_cluster" {
14161416
region = "us-central1"
14171417
14181418
cluster_config {
1419+
software_config {
1420+
image_version = "2.0.35-debian10"
1421+
}
1422+
14191423
gce_cluster_config {
14201424
subnetwork = "%s"
14211425
zone = "%s"
@@ -1651,6 +1655,9 @@ resource "google_dataproc_cluster" "basic" {
16511655
region = "us-central1"
16521656
16531657
cluster_config {
1658+
software_config {
1659+
image_version = "2.0.35-debian10"
1660+
}
16541661
gce_cluster_config {
16551662
subnetwork = "%s"
16561663
zone = "us-central1-f"
@@ -1763,6 +1770,7 @@ resource "google_dataproc_cluster" "with_init_action" {
17631770
17641771
# Keep the costs down with smallest config we can get away with
17651772
software_config {
1773+
image_version = "2.0.35-debian10"
17661774
override_properties = {
17671775
"dataproc:dataproc.allow.zero.workers" = "true"
17681776
}
@@ -2027,6 +2035,7 @@ resource "google_dataproc_cluster" "with_bucket" {
20272035
20282036
# Keep the costs down with smallest config we can get away with
20292037
software_config {
2038+
image_version = "2.0.35-debian10"
20302039
override_properties = {
20312040
"dataproc:dataproc.allow.zero.workers" = "true"
20322041
}
@@ -2060,6 +2069,7 @@ resource "google_dataproc_cluster" "with_bucket" {
20602069
20612070
# Keep the costs down with smallest config we can get away with
20622071
software_config {
2072+
image_version = "2.0.35-debian10"
20632073
override_properties = {
20642074
"dataproc:dataproc.allow.zero.workers" = "true"
20652075
}
@@ -2249,6 +2259,7 @@ resource "google_dataproc_cluster" "with_service_account" {
22492259
cluster_config {
22502260
# Keep the costs down with smallest config we can get away with
22512261
software_config {
2262+
image_version = "2.0.35-debian10"
22522263
override_properties = {
22532264
"dataproc:dataproc.allow.zero.workers" = "true"
22542265
}

Diff for: google-beta/services/dataproc/resource_dataproc_job_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -864,6 +864,7 @@ resource "google_dataproc_cluster" "basic" {
864864
cluster_config {
865865
# Keep the costs down with smallest config we can get away with
866866
software_config {
867+
image_version = "2.0.35-debian10"
867868
override_properties = {
868869
"dataproc:dataproc.allow.zero.workers" = "true"
869870
}

0 commit comments

Comments
 (0)