Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make zone required in google_composer_environment.node_config #2967

Merged
merged 1 commit into from
Feb 1, 2019
Merged

Make zone required in google_composer_environment.node_config #2967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions google/resource_composer_environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,7 @@ func resourceComposerEnvironment() *schema.Resource {
Schema: map[string]*schema.Schema{
"zone": {
Type: schema.TypeString,
Computed: true,
Optional: true,
Required: true,
ForceNew: true,
DiffSuppressFunc: compareSelfLinkOrResourceName,
},
Expand Down
10 changes: 1 addition & 9 deletions website/docs/r/composer_environment.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,27 +167,19 @@ The `config` block supports:
The `node_config` block supports:

* `zone` -
(Optional)
(Required)
The Compute Engine zone in which to deploy the VMs running the
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
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` -
(Optional)
The Compute Engine machine type used for cluster instances,
specified as a name or relative resource name. For example:
"projects/{project}/zones/{zone}/machineTypes/{machineType}". Must belong to the enclosing environment's project and
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` -
(Optional)
The Compute Engine network to be used for machine
Expand Down
9 changes: 2 additions & 7 deletions website/docs/r/container_cluster.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,6 @@ resource "google_container_cluster" "primary" {

tags = ["foo", "bar"]
}

timeouts {
create = "30m"
update = "40m"
}
}

# The following outputs allow authentication and connectivity to the GKE Cluster.
Expand Down Expand Up @@ -489,8 +484,8 @@ exported:
[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.
- `update` - (Default `10 minutes`) Used for updates to clusters
- `delete` - (Default `10 minutes`) Used for destroying clusters.

## Import

Expand Down
15 changes: 0 additions & 15 deletions website/docs/r/container_node_pool.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ resource "google_container_node_pool" "np" {
zone = "us-central1-a"
cluster = "${google_container_cluster.primary.name}"
node_count = 3

timeouts {
create = "30m"
update = "20m"
}
}

resource "google_container_cluster" "primary" {
Expand Down Expand Up @@ -167,16 +162,6 @@ The `management` block supports:

* `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

Node pools can be imported using the `project`, `zone`, `cluster` and `name`. If
Expand Down