Skip to content

Commit d3b2e0f

Browse files
authored
fix: Remove web_server_ipv4_cidr_block from composer v2 (#52)
* Remove web_server_ipv4_cidr_block from composer v2 Composer v2 does not support web_server_ipv4_cidr_block fixes #51 * Remove web_server_ipv4_cidr_block from Composer v2 Composer v2 does not support web_server_ipv4_cidr_block so this commit removes this setting. fixes #51
1 parent a4644c0 commit d3b2e0f

File tree

3 files changed

+0
-9
lines changed

3 files changed

+0
-9
lines changed

modules/create_environment_v2/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ module "composer" {
4646
| use\_private\_environment | Enable private environment. | `bool` | `false` | no |
4747
| web\_server | Configuration for resources used by Airflow web server. | <pre>object({<br> cpu = string<br> memory_gb = number<br> storage_gb = number<br> })</pre> | <pre>{<br> "cpu": 2,<br> "memory_gb": 7.5,<br> "storage_gb": 5<br>}</pre> | no |
4848
| web\_server\_allowed\_ip\_ranges | The network-level access control policy for the Airflow web server. If unspecified, no network-level access restrictions will be applied. | <pre>list(object({<br> value = string,<br> description = string<br> }))</pre> | `null` | no |
49-
| web\_server\_ipv4\_cidr | The CIDR block from which IP range in tenant project will be reserved for the web server. | `string` | `null` | no |
5049
| worker | Configuration for resources used by Airflow workers. | <pre>object({<br> cpu = string<br> memory_gb = number<br> storage_gb = number<br> min_count = number<br> max_count = number<br> })</pre> | <pre>{<br> "cpu": 2,<br> "max_count": 6,<br> "memory_gb": 7.5,<br> "min_count": 2,<br> "storage_gb": 5<br>}</pre> | no |
5150

5251
## Outputs

modules/create_environment_v2/main.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,12 @@ resource "google_composer_environment" "composer_env" {
7373
enable_private_endpoint = var.enable_private_endpoint
7474
master_ipv4_cidr_block = var.master_ipv4_cidr
7575
cloud_sql_ipv4_cidr_block = var.cloud_sql_ipv4_cidr
76-
web_server_ipv4_cidr_block = var.web_server_ipv4_cidr
7776
cloud_composer_network_ipv4_cidr_block = var.cloud_composer_network_ipv4_cidr_block
7877
}] : []
7978
content {
8079
enable_private_endpoint = private_environment_config.value["enable_private_endpoint"]
8180
master_ipv4_cidr_block = private_environment_config.value["master_ipv4_cidr_block"]
8281
cloud_sql_ipv4_cidr_block = private_environment_config.value["cloud_sql_ipv4_cidr_block"]
83-
web_server_ipv4_cidr_block = private_environment_config.value["web_server_ipv4_cidr_block"]
8482
cloud_composer_network_ipv4_cidr_block = private_environment_config.value["cloud_composer_network_ipv4_cidr_block"]
8583
}
8684
}

modules/create_environment_v2/variables.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,6 @@ variable "cloud_sql_ipv4_cidr" {
118118
default = null
119119
}
120120

121-
variable "web_server_ipv4_cidr" {
122-
description = "The CIDR block from which IP range in tenant project will be reserved for the web server."
123-
type = string
124-
default = null
125-
}
126-
127121
variable "master_ipv4_cidr" {
128122
description = "The CIDR block from which IP range in tenant project will be reserved for the master."
129123
type = string

0 commit comments

Comments
 (0)