Skip to content

Commit

Permalink
Composer internal ip (hashicorp#9507) (hashicorp#16815)
Browse files Browse the repository at this point in the history
[upstream:160dcbcb63977c2e56e4a342905588829b120e3f]

Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
modular-magician authored Dec 15, 2023
1 parent a9f3b15 commit aa90655
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .changelog/9507.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
composer: added support for `composer_internal_ipv4_cidr_block` field to `google_composer_environment`
```
6 changes: 4 additions & 2 deletions google/services/composer/resource_composer_environment.go
Original file line number Diff line number Diff line change
Expand Up @@ -1514,8 +1514,10 @@ func flattenComposerEnvironmentConfigPrivateEnvironmentConfig(envCfg *composer.P
if envCfg.NetworkingConfig != nil {
transformed["connection_type"] = envCfg.NetworkingConfig.ConnectionType
}
transformed["enable_private_endpoint"] = envCfg.PrivateClusterConfig.EnablePrivateEndpoint
transformed["master_ipv4_cidr_block"] = envCfg.PrivateClusterConfig.MasterIpv4CidrBlock
if envCfg.PrivateClusterConfig != nil {
transformed["enable_private_endpoint"] = envCfg.PrivateClusterConfig.EnablePrivateEndpoint
transformed["master_ipv4_cidr_block"] = envCfg.PrivateClusterConfig.MasterIpv4CidrBlock
}
transformed["cloud_sql_ipv4_cidr_block"] = envCfg.CloudSqlIpv4CidrBlock
transformed["web_server_ipv4_cidr_block"] = envCfg.WebServerIpv4CidrBlock
transformed["cloud_composer_network_ipv4_cidr_block"] = envCfg.CloudComposerNetworkIpv4CidrBlock
Expand Down
5 changes: 5 additions & 0 deletions website/docs/r/composer_environment.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,11 @@ The `node_config` block supports:
packets from node IP addresses instead of Pod IP addresses
See the [documentation](https://cloud.google.com/composer/docs/enable-ip-masquerade-agent).

* `composer_internal_ipv4_cidr_block` -
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html), Cloud Composer 3 only)
At least /20 IPv4 cidr range that will be used by Composer internal components.
Cannot be updated.

The `software_config` block supports:

* `airflow_config_overrides` -
Expand Down

0 comments on commit aa90655

Please sign in to comment.