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.

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

Cloud Composer support for master authorized networks #10780

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 0 deletions .changelog/5550.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
Add support for Cloud Composer master authorized networks flag
```
34 changes: 34 additions & 0 deletions website/docs/r/composer_environment.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,14 @@ The following arguments are supported:
* `maintenance_window` -
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
The configuration settings for Cloud Composer maintenance windows.

* `master_authorized_networks_config` -
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
Configuration options for the master authorized networks feature. Enabled
master authorized networks will disallow all external traffic to access
Kubernetes master through HTTPS except traffic from the given CIDR blocks,
Google Compute Engine Public IPs and Google Prod IPs. Structure is
[documented below](#nested_master_authorized_networks_config).

<a name="nested_node_config"></a>The `node_config` block supports:

Expand Down Expand Up @@ -565,6 +573,24 @@ The `web_server_network_access_control` supports:
The only allowed values for 'FREQ' field are 'FREQ=DAILY' and 'FREQ=WEEKLY;BYDAY=...'.
Example values: 'FREQ=WEEKLY;BYDAY=TU,WE', 'FREQ=DAILY'.

<a name="nested_master_authorized_networks_config"></a>The `master_authorized_networks_config` block supports:
* `enabled` -
(Required)
Whether or not master authorized networks is enabled.

* `cidr_blocks` -
`cidr_blocks `define up to 50 external networks that could access Kubernetes master through HTTPS. Structure is [documented below](#nested_cidr_blocks).

<a name="nested_cidr_blocks"></a>The `cidr_blocks` supports:

* `display_name` -
(Optional)
`display_name` is a field for users to identify CIDR blocks.

* `cidr_block` -
(Required)
`cidr_block< must be specified in CIDR notation.

## Argument Reference - Cloud Composer 2

The following arguments are supported:
Expand Down Expand Up @@ -630,6 +656,14 @@ The `config` block supports:
environment size are `ENVIRONMENT_SIZE_SMALL`, `ENVIRONMENT_SIZE_MEDIUM`,
and `ENVIRONMENT_SIZE_LARGE`.

* `master_authorized_networks_config` -
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
Configuration options for the master authorized networks feature. Enabled
master authorized networks will disallow all external traffic to access
Kubernetes master through HTTPS except traffic from the given CIDR blocks,
Google Compute Engine Public IPs and Google Prod IPs. Structure is
documented below.

The `node_config` block supports:

* `network` -
Expand Down