Skip to content

Commit

Permalink
Composer enable_ip_masq_agent flag support (beta) (#9698) (#5277) (#1…
Browse files Browse the repository at this point in the history
…0256)

Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
modular-magician authored Oct 5, 2021
1 parent d31ab90 commit 46db67f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .changelog/5277.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
composer: added field `enable_ip_masq_agent` to resource `google_composer_environment` (beta)
```
6 changes: 3 additions & 3 deletions google/resource_composer_environment_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -471,12 +471,12 @@ func testAccComposerEnvironment_nodeCfg(environment, network, subnetwork, servic
return fmt.Sprintf(`
resource "google_composer_environment" "test" {
name = "%s"
region = "us-central1"
region = "us-east1" # later should be changed to us-central1, when ip_masq_agent feature is accessible globally
config {
node_config {
network = google_compute_network.test.self_link
subnetwork = google_compute_subnetwork.test.self_link
zone = "us-central1-a"
zone = "us-east1-b" # later should be changed to us-central1-a, when ip_masq_agent feature is accessible globally
service_account = google_service_account.test.name
ip_allocation_policy {
Expand All @@ -496,7 +496,7 @@ resource "google_compute_network" "test" {
resource "google_compute_subnetwork" "test" {
name = "%s"
ip_cidr_range = "10.2.0.0/16"
region = "us-central1"
region = "us-east1" # later should be changed to us-central1, when ip_masq_agent feature is accessible globally
network = google_compute_network.test.self_link
}
Expand Down
7 changes: 7 additions & 0 deletions website/docs/r/composer_environment.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,13 @@ The `node_config` block supports:
The range of possible values is 8-110, and the default is 32.
Cannot be updated.

* `enable_ip_masq_agent` -
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
Deploys 'ip-masq-agent' daemon set in the GKE cluster and defines
nonMasqueradeCIDRs equals to pod IP range so IP masquerading is used for
all destination addresses, except between pods traffic.
See the [documentation](https://cloud.google.com/kubernetes-engine/docs/how-to/ip-masquerade-agent).

The `software_config` block supports:

* `airflow_config_overrides` -
Expand Down

0 comments on commit 46db67f

Please sign in to comment.