diff --git a/google/resource_compute_instance.go b/google/resource_compute_instance.go index 989bcbe611d..15400cc3abf 100644 --- a/google/resource_compute_instance.go +++ b/google/resource_compute_instance.go @@ -33,9 +33,9 @@ func resourceComputeInstance() *schema.Resource { MigrateState: resourceComputeInstanceMigrateState, Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(6 * time.Minute), - Update: schema.DefaultTimeout(6 * time.Minute), - Delete: schema.DefaultTimeout(6 * time.Minute), + Create: schema.DefaultTimeout(20 * time.Minute), + Update: schema.DefaultTimeout(20 * time.Minute), + Delete: schema.DefaultTimeout(20 * time.Minute), }, // A compute instance is more or less a superset of a compute instance diff --git a/google/resource_container_cluster.go b/google/resource_container_cluster.go index 73b466b445b..6ddceeddbb1 100644 --- a/google/resource_container_cluster.go +++ b/google/resource_container_cluster.go @@ -58,7 +58,7 @@ func resourceContainerCluster() *schema.Resource { Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(30 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), + Update: schema.DefaultTimeout(60 * time.Minute), Delete: schema.DefaultTimeout(30 * time.Minute), }, diff --git a/google/resource_dataproc_cluster.go b/google/resource_dataproc_cluster.go index 036801a228c..f36ff1ca6d3 100644 --- a/google/resource_dataproc_cluster.go +++ b/google/resource_dataproc_cluster.go @@ -23,9 +23,9 @@ func resourceDataprocCluster() *schema.Resource { Delete: resourceDataprocClusterDelete, Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(15 * time.Minute), - Update: schema.DefaultTimeout(5 * time.Minute), - Delete: schema.DefaultTimeout(5 * time.Minute), + Create: schema.DefaultTimeout(20 * time.Minute), + Update: schema.DefaultTimeout(20 * time.Minute), + Delete: schema.DefaultTimeout(20 * time.Minute), }, Schema: map[string]*schema.Schema{ diff --git a/google/resource_sql_database_instance.go b/google/resource_sql_database_instance.go index ec3e398efe4..0732c9d8091 100644 --- a/google/resource_sql_database_instance.go +++ b/google/resource_sql_database_instance.go @@ -46,9 +46,9 @@ func resourceSqlDatabaseInstance() *schema.Resource { }, Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(10 * time.Minute), - Update: schema.DefaultTimeout(10 * time.Minute), - Delete: schema.DefaultTimeout(10 * time.Minute), + Create: schema.DefaultTimeout(20 * time.Minute), + Update: schema.DefaultTimeout(20 * time.Minute), + Delete: schema.DefaultTimeout(20 * time.Minute), }, CustomizeDiff: customdiff.All( diff --git a/website/docs/r/compute_instance.html.markdown b/website/docs/r/compute_instance.html.markdown index 7b6453b05cc..5dfda3c822c 100644 --- a/website/docs/r/compute_instance.html.markdown +++ b/website/docs/r/compute_instance.html.markdown @@ -88,9 +88,6 @@ The following arguments are supported: packets with non-matching source or destination IPs. This defaults to false. -* `create_timeout` - (Optional) Configurable timeout in minutes for creating instances. Default is 4 minutes. - Changing this forces a new resource to be created. - * `description` - (Optional) A brief description of this resource. * `deletion_protection` - (Optional) Enable deletion protection on this instance. Defaults to false. @@ -348,6 +345,15 @@ exported: encoded SHA-256 hash of the [customer-supplied encryption key] (https://cloud.google.com/compute/docs/disks/customer-supplied-encryption) that protects this resource. +## Timeouts + +This resource provides the following +[Timeouts](/docs/configuration/resources.html#timeouts) configuration options: + +- `create` - Default is 20 minutes. +- `update` - Default is 20 minutes. +- `delete` - Default is 20 minutes. + ## Import ~> **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. diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown index 15f8b4ddf96..350c06fc197 100644 --- a/website/docs/r/container_cluster.html.markdown +++ b/website/docs/r/container_cluster.html.markdown @@ -629,15 +629,14 @@ exported: notation (e.g. `1.2.3.4/29`). Service addresses are typically put in the last `/16` from the container CIDR. - ## Timeouts -`google_container_cluster` provides the following +This resource provides the following [Timeouts](/docs/configuration/resources.html#timeouts) configuration options: -- `create` - (Default `30 minutes`) Used for clusters -- `update` - (Default `30 minutes`) Used for updates to clusters -- `delete` - (Default `30 minutes`) Used for destroying clusters. +- `create` - Default is 30 minutes. +- `update` - Default is 60 minutes. +- `delete` - Default is 30 minutes. ## Import diff --git a/website/docs/r/dataproc_cluster.html.markdown b/website/docs/r/dataproc_cluster.html.markdown index 519509aea06..478b9b2cad8 100644 --- a/website/docs/r/dataproc_cluster.html.markdown +++ b/website/docs/r/dataproc_cluster.html.markdown @@ -471,11 +471,12 @@ exported: * `cluster_config.0.software_config.0.properties` - A list of the properties used to set the daemon config files. This will include any values supplied by the user via `cluster_config.software_config.override_properties` + ## Timeouts -`google_dataproc_cluster` provides the following +This resource provides the following [Timeouts](/docs/configuration/resources.html#timeouts) configuration options: -- `create` - (Default `10 minutes`) Used for creating clusters. -- `update` - (Default `5 minutes`) Used for updating clusters -- `delete` - (Default `5 minutes`) Used for destroying clusters. +- `create` - Default is 20 minutes. +- `update` - Default is 20 minutes. +- `delete` - Default is 20 minutes. diff --git a/website/docs/r/sql_database_instance.html.markdown b/website/docs/r/sql_database_instance.html.markdown index e3bcc4944e5..cef501f404a 100644 --- a/website/docs/r/sql_database_instance.html.markdown +++ b/website/docs/r/sql_database_instance.html.markdown @@ -399,9 +399,9 @@ performing filtering in a Terraform config. `google_sql_database_instance` provides the following [Timeouts](/docs/configuration/resources.html#timeouts) configuration options: -- `create` - Default is 10 minutes. -- `update` - Default is 10 minutes. -- `delete` - Default is 10 minutes. +- `create` - Default is 20 minutes. +- `update` - Default is 20 minutes. +- `delete` - Default is 20 minutes. ## Import