mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-03 01:01:06 +00:00
Make zone required in google_composer_environment.node_config (#2967)
<!-- This change is generated by MagicModules. --> /cc @rileykarson
This commit is contained in:
parent
69e445bd59
commit
af7cf2a69b
@ -91,8 +91,7 @@ func resourceComposerEnvironment() *schema.Resource {
|
|||||||
Schema: map[string]*schema.Schema{
|
Schema: map[string]*schema.Schema{
|
||||||
"zone": {
|
"zone": {
|
||||||
Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
Computed: true,
|
Required: true,
|
||||||
Optional: true,
|
|
||||||
ForceNew: true,
|
ForceNew: true,
|
||||||
DiffSuppressFunc: compareSelfLinkOrResourceName,
|
DiffSuppressFunc: compareSelfLinkOrResourceName,
|
||||||
},
|
},
|
||||||
|
@ -167,16 +167,12 @@ The `config` block supports:
|
|||||||
The `node_config` block supports:
|
The `node_config` block supports:
|
||||||
|
|
||||||
* `zone` -
|
* `zone` -
|
||||||
(Optional)
|
(Required)
|
||||||
The Compute Engine zone in which to deploy the VMs running the
|
The Compute Engine zone in which to deploy the VMs running the
|
||||||
Apache Airflow software, specified as the zone name or
|
Apache Airflow software, specified as the zone name or
|
||||||
relative resource name (e.g. "projects/{project}/zones/{zone}"). Must belong to the enclosing environment's project
|
relative resource name (e.g. "projects/{project}/zones/{zone}"). Must belong to the enclosing environment's project
|
||||||
and region.
|
and region.
|
||||||
|
|
||||||
If both zone and machineType are specified, machineType must belong to this zone. If neither is specified, the service
|
|
||||||
will pick default values in the specified resource's region. If only one of zone or machineType is specified, the
|
|
||||||
location information from the specified field will be used for the location-unspecified field.
|
|
||||||
|
|
||||||
* `machine_type` -
|
* `machine_type` -
|
||||||
(Optional)
|
(Optional)
|
||||||
The Compute Engine machine type used for cluster instances,
|
The Compute Engine machine type used for cluster instances,
|
||||||
@ -184,10 +180,6 @@ The `node_config` block supports:
|
|||||||
"projects/{project}/zones/{zone}/machineTypes/{machineType}". Must belong to the enclosing environment's project and
|
"projects/{project}/zones/{zone}/machineTypes/{machineType}". Must belong to the enclosing environment's project and
|
||||||
region/zone.
|
region/zone.
|
||||||
|
|
||||||
If both zone and machineType are specified, machineType must belong to this zone. If neither is specified, the service
|
|
||||||
will pick default values in the specified resource's region. If only one of zone or machineType is specified, the
|
|
||||||
location information from the specified field will be used for the location-unspecified field.
|
|
||||||
|
|
||||||
* `network` -
|
* `network` -
|
||||||
(Optional)
|
(Optional)
|
||||||
The Compute Engine network to be used for machine
|
The Compute Engine network to be used for machine
|
||||||
|
@ -113,11 +113,6 @@ resource "google_container_cluster" "primary" {
|
|||||||
|
|
||||||
tags = ["foo", "bar"]
|
tags = ["foo", "bar"]
|
||||||
}
|
}
|
||||||
|
|
||||||
timeouts {
|
|
||||||
create = "30m"
|
|
||||||
update = "40m"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# The following outputs allow authentication and connectivity to the GKE Cluster
|
# The following outputs allow authentication and connectivity to the GKE Cluster
|
||||||
@ -564,8 +559,8 @@ exported:
|
|||||||
[Timeouts](/docs/configuration/resources.html#timeouts) configuration options:
|
[Timeouts](/docs/configuration/resources.html#timeouts) configuration options:
|
||||||
|
|
||||||
- `create` - (Default `30 minutes`) Used for clusters
|
- `create` - (Default `30 minutes`) Used for clusters
|
||||||
- `update` - (Default `30 minutes`) Used for updates to clusters
|
- `update` - (Default `10 minutes`) Used for updates to clusters
|
||||||
- `delete` - (Default `30 minutes`) Used for destroying clusters.
|
- `delete` - (Default `10 minutes`) Used for destroying clusters.
|
||||||
|
|
||||||
## Import
|
## Import
|
||||||
|
|
||||||
|
@ -54,11 +54,6 @@ resource "google_container_node_pool" "np" {
|
|||||||
zone = "us-central1-a"
|
zone = "us-central1-a"
|
||||||
cluster = "${google_container_cluster.primary.name}"
|
cluster = "${google_container_cluster.primary.name}"
|
||||||
node_count = 3
|
node_count = 3
|
||||||
|
|
||||||
timeouts {
|
|
||||||
create = "30m"
|
|
||||||
update = "20m"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "google_container_cluster" "primary" {
|
resource "google_container_cluster" "primary" {
|
||||||
@ -149,16 +144,6 @@ The `management` block supports:
|
|||||||
|
|
||||||
* `auto_upgrade` - (Optional) Whether the nodes will be automatically upgraded.
|
* `auto_upgrade` - (Optional) Whether the nodes will be automatically upgraded.
|
||||||
|
|
||||||
<a id="timeouts"></a>
|
|
||||||
## Timeouts
|
|
||||||
|
|
||||||
`google_container_node_pool` provides the following
|
|
||||||
[Timeouts](/docs/configuration/resources.html#timeouts) configuration options:
|
|
||||||
|
|
||||||
- `create` - (Default `30 minutes`) Used for adding node pools
|
|
||||||
- `update` - (Default `10 minutes`) Used for updates to node pools
|
|
||||||
- `delete` - (Default `10 minutes`) Used for removing node pools.
|
|
||||||
|
|
||||||
## Import
|
## Import
|
||||||
|
|
||||||
Node pools can be imported using the `project`, `zone`, `cluster` and `name`. If
|
Node pools can be imported using the `project`, `zone`, `cluster` and `name`. If
|
||||||
|
Loading…
Reference in New Issue
Block a user