Skip to content

Commit 86991fe

Browse files
committed
fix: depend master_athorized_networks_config on master_authorized_networks
1 parent dc7d24e commit 86991fe

File tree

10 files changed

+10
-10
lines changed

10 files changed

+10
-10
lines changed

autogen/main/cluster.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ resource "google_container_cluster" "primary" {
266266
enable_autopilot = true
267267
{% endif %}
268268
dynamic "master_authorized_networks_config" {
269-
for_each = {% if private_cluster %}(var.enable_private_endpoint && !var.deploy_using_private_endpoint) || {% endif %}var.gcp_public_cidrs_access_enabled != null || length(var.master_authorized_networks) > 0 ? [true] : []
269+
for_each = var.master_authorized_networks != null ? [true] : []
270270
content {
271271
gcp_public_cidrs_access_enabled = var.gcp_public_cidrs_access_enabled
272272
dynamic "cidr_blocks" {

cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ resource "google_container_cluster" "primary" {
200200
}
201201

202202
dynamic "master_authorized_networks_config" {
203-
for_each = var.gcp_public_cidrs_access_enabled != null || length(var.master_authorized_networks) > 0 ? [true] : []
203+
for_each = var.master_authorized_networks != null ? [true] : []
204204
content {
205205
gcp_public_cidrs_access_enabled = var.gcp_public_cidrs_access_enabled
206206
dynamic "cidr_blocks" {

modules/beta-autopilot-private-cluster/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ resource "google_container_cluster" "primary" {
121121
enable_fqdn_network_policy = var.enable_fqdn_network_policy
122122
enable_autopilot = true
123123
dynamic "master_authorized_networks_config" {
124-
for_each = (var.enable_private_endpoint && !var.deploy_using_private_endpoint) || var.gcp_public_cidrs_access_enabled != null || length(var.master_authorized_networks) > 0 ? [true] : []
124+
for_each = var.master_authorized_networks != null ? [true] : []
125125
content {
126126
gcp_public_cidrs_access_enabled = var.gcp_public_cidrs_access_enabled
127127
dynamic "cidr_blocks" {

modules/beta-autopilot-public-cluster/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ resource "google_container_cluster" "primary" {
121121
enable_fqdn_network_policy = var.enable_fqdn_network_policy
122122
enable_autopilot = true
123123
dynamic "master_authorized_networks_config" {
124-
for_each = var.gcp_public_cidrs_access_enabled != null || length(var.master_authorized_networks) > 0 ? [true] : []
124+
for_each = var.master_authorized_networks != null ? [true] : []
125125
content {
126126
gcp_public_cidrs_access_enabled = var.gcp_public_cidrs_access_enabled
127127
dynamic "cidr_blocks" {

modules/beta-private-cluster-update-variant/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ resource "google_container_cluster" "primary" {
214214

215215
enable_fqdn_network_policy = var.enable_fqdn_network_policy
216216
dynamic "master_authorized_networks_config" {
217-
for_each = (var.enable_private_endpoint && !var.deploy_using_private_endpoint) || var.gcp_public_cidrs_access_enabled != null || length(var.master_authorized_networks) > 0 ? [true] : []
217+
for_each = var.master_authorized_networks != null ? [true] : []
218218
content {
219219
gcp_public_cidrs_access_enabled = var.gcp_public_cidrs_access_enabled
220220
dynamic "cidr_blocks" {

modules/beta-private-cluster/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ resource "google_container_cluster" "primary" {
214214

215215
enable_fqdn_network_policy = var.enable_fqdn_network_policy
216216
dynamic "master_authorized_networks_config" {
217-
for_each = (var.enable_private_endpoint && !var.deploy_using_private_endpoint) || var.gcp_public_cidrs_access_enabled != null || length(var.master_authorized_networks) > 0 ? [true] : []
217+
for_each = var.master_authorized_networks != null ? [true] : []
218218
content {
219219
gcp_public_cidrs_access_enabled = var.gcp_public_cidrs_access_enabled
220220
dynamic "cidr_blocks" {

modules/beta-public-cluster-update-variant/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ resource "google_container_cluster" "primary" {
214214

215215
enable_fqdn_network_policy = var.enable_fqdn_network_policy
216216
dynamic "master_authorized_networks_config" {
217-
for_each = var.gcp_public_cidrs_access_enabled != null || length(var.master_authorized_networks) > 0 ? [true] : []
217+
for_each = var.master_authorized_networks != null ? [true] : []
218218
content {
219219
gcp_public_cidrs_access_enabled = var.gcp_public_cidrs_access_enabled
220220
dynamic "cidr_blocks" {

modules/beta-public-cluster/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ resource "google_container_cluster" "primary" {
214214

215215
enable_fqdn_network_policy = var.enable_fqdn_network_policy
216216
dynamic "master_authorized_networks_config" {
217-
for_each = var.gcp_public_cidrs_access_enabled != null || length(var.master_authorized_networks) > 0 ? [true] : []
217+
for_each = var.master_authorized_networks != null ? [true] : []
218218
content {
219219
gcp_public_cidrs_access_enabled = var.gcp_public_cidrs_access_enabled
220220
dynamic "cidr_blocks" {

modules/private-cluster-update-variant/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ resource "google_container_cluster" "primary" {
200200
}
201201

202202
dynamic "master_authorized_networks_config" {
203-
for_each = (var.enable_private_endpoint && !var.deploy_using_private_endpoint) || var.gcp_public_cidrs_access_enabled != null || length(var.master_authorized_networks) > 0 ? [true] : []
203+
for_each = var.master_authorized_networks != null ? [true] : []
204204
content {
205205
gcp_public_cidrs_access_enabled = var.gcp_public_cidrs_access_enabled
206206
dynamic "cidr_blocks" {

modules/private-cluster/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ resource "google_container_cluster" "primary" {
200200
}
201201

202202
dynamic "master_authorized_networks_config" {
203-
for_each = (var.enable_private_endpoint && !var.deploy_using_private_endpoint) || var.gcp_public_cidrs_access_enabled != null || length(var.master_authorized_networks) > 0 ? [true] : []
203+
for_each = var.master_authorized_networks != null ? [true] : []
204204
content {
205205
gcp_public_cidrs_access_enabled = var.gcp_public_cidrs_access_enabled
206206
dynamic "cidr_blocks" {

0 commit comments

Comments
 (0)