Skip to content

Commit 8d8f339

Browse files
danawillowmodular-magician
authored andcommitted
increase some timeouts
Signed-off-by: Modular Magician <[email protected]>
1 parent c9ddd0c commit 8d8f339

8 files changed

+31
-25
lines changed

google/resource_compute_instance.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ func resourceComputeInstance() *schema.Resource {
3333
MigrateState: resourceComputeInstanceMigrateState,
3434

3535
Timeouts: &schema.ResourceTimeout{
36-
Create: schema.DefaultTimeout(6 * time.Minute),
37-
Update: schema.DefaultTimeout(6 * time.Minute),
38-
Delete: schema.DefaultTimeout(6 * time.Minute),
36+
Create: schema.DefaultTimeout(20 * time.Minute),
37+
Update: schema.DefaultTimeout(20 * time.Minute),
38+
Delete: schema.DefaultTimeout(20 * time.Minute),
3939
},
4040

4141
// A compute instance is more or less a superset of a compute instance

google/resource_container_cluster.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func resourceContainerCluster() *schema.Resource {
5858

5959
Timeouts: &schema.ResourceTimeout{
6060
Create: schema.DefaultTimeout(30 * time.Minute),
61-
Update: schema.DefaultTimeout(30 * time.Minute),
61+
Update: schema.DefaultTimeout(60 * time.Minute),
6262
Delete: schema.DefaultTimeout(30 * time.Minute),
6363
},
6464

google/resource_dataproc_cluster.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ func resourceDataprocCluster() *schema.Resource {
2323
Delete: resourceDataprocClusterDelete,
2424

2525
Timeouts: &schema.ResourceTimeout{
26-
Create: schema.DefaultTimeout(15 * time.Minute),
27-
Update: schema.DefaultTimeout(5 * time.Minute),
28-
Delete: schema.DefaultTimeout(5 * time.Minute),
26+
Create: schema.DefaultTimeout(20 * time.Minute),
27+
Update: schema.DefaultTimeout(20 * time.Minute),
28+
Delete: schema.DefaultTimeout(20 * time.Minute),
2929
},
3030

3131
Schema: map[string]*schema.Schema{

google/resource_sql_database_instance.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ func resourceSqlDatabaseInstance() *schema.Resource {
4646
},
4747

4848
Timeouts: &schema.ResourceTimeout{
49-
Create: schema.DefaultTimeout(10 * time.Minute),
50-
Update: schema.DefaultTimeout(10 * time.Minute),
51-
Delete: schema.DefaultTimeout(10 * time.Minute),
49+
Create: schema.DefaultTimeout(20 * time.Minute),
50+
Update: schema.DefaultTimeout(20 * time.Minute),
51+
Delete: schema.DefaultTimeout(20 * time.Minute),
5252
},
5353

5454
CustomizeDiff: customdiff.All(

website/docs/r/compute_instance.html.markdown

+9-3
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@ The following arguments are supported:
8888
packets with non-matching source or destination IPs.
8989
This defaults to false.
9090

91-
* `create_timeout` - (Optional) Configurable timeout in minutes for creating instances. Default is 4 minutes.
92-
Changing this forces a new resource to be created.
93-
9491
* `description` - (Optional) A brief description of this resource.
9592

9693
* `deletion_protection` - (Optional) Enable deletion protection on this instance. Defaults to false.
@@ -348,6 +345,15 @@ exported:
348345
encoded SHA-256 hash of the [customer-supplied encryption key]
349346
(https://cloud.google.com/compute/docs/disks/customer-supplied-encryption) that protects this resource.
350347

348+
## Timeouts
349+
350+
This resource provides the following
351+
[Timeouts](/docs/configuration/resources.html#timeouts) configuration options:
352+
353+
- `create` - Default is 20 minutes.
354+
- `update` - Default is 20 minutes.
355+
- `delete` - Default is 20 minutes.
356+
351357
## Import
352358

353359
~> **Note:** The fields `boot_disk.0.disk_encryption_raw` and `attached_disk.*.disk_encryption_key_raw` cannot be imported automatically. The API doesn't return this information. If you are setting one of these fields in your config, you will need to update your state manually after importing the resource.

website/docs/r/container_cluster.html.markdown

+4-5
Original file line numberDiff line numberDiff line change
@@ -629,15 +629,14 @@ exported:
629629
notation (e.g. `1.2.3.4/29`). Service addresses are typically put in the last
630630
`/16` from the container CIDR.
631631

632-
<a id="timeouts"></a>
633632
## Timeouts
634633

635-
`google_container_cluster` provides the following
634+
This resource provides the following
636635
[Timeouts](/docs/configuration/resources.html#timeouts) configuration options:
637636

638-
- `create` - (Default `30 minutes`) Used for clusters
639-
- `update` - (Default `30 minutes`) Used for updates to clusters
640-
- `delete` - (Default `30 minutes`) Used for destroying clusters.
637+
- `create` - Default is 30 minutes.
638+
- `update` - Default is 60 minutes.
639+
- `delete` - Default is 30 minutes.
641640

642641
## Import
643642

website/docs/r/dataproc_cluster.html.markdown

+5-4
Original file line numberDiff line numberDiff line change
@@ -471,11 +471,12 @@ exported:
471471
* `cluster_config.0.software_config.0.properties` - A list of the properties used to set the daemon config files.
472472
This will include any values supplied by the user via `cluster_config.software_config.override_properties`
473473

474+
474475
## Timeouts
475476

476-
`google_dataproc_cluster` provides the following
477+
This resource provides the following
477478
[Timeouts](/docs/configuration/resources.html#timeouts) configuration options:
478479

479-
- `create` - (Default `10 minutes`) Used for creating clusters.
480-
- `update` - (Default `5 minutes`) Used for updating clusters
481-
- `delete` - (Default `5 minutes`) Used for destroying clusters.
480+
- `create` - Default is 20 minutes.
481+
- `update` - Default is 20 minutes.
482+
- `delete` - Default is 20 minutes.

website/docs/r/sql_database_instance.html.markdown

+3-3
Original file line numberDiff line numberDiff line change
@@ -399,9 +399,9 @@ performing filtering in a Terraform config.
399399
`google_sql_database_instance` provides the following
400400
[Timeouts](/docs/configuration/resources.html#timeouts) configuration options:
401401

402-
- `create` - Default is 10 minutes.
403-
- `update` - Default is 10 minutes.
404-
- `delete` - Default is 10 minutes.
402+
- `create` - Default is 20 minutes.
403+
- `update` - Default is 20 minutes.
404+
- `delete` - Default is 20 minutes.
405405

406406
## Import
407407

0 commit comments

Comments
 (0)