Skip to content

Commit 278e52f

Browse files
Dev25Dev25
committed
Regenerate/fmt
1 parent b0625cb commit 278e52f

File tree

8 files changed

+58
-58
lines changed

8 files changed

+58
-58
lines changed

‎main.tf

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
data "google_compute_zones" "available" {
2323
provider = google
2424

25-
project = var.project_id
26-
region = var.region
25+
project = var.project_id
26+
region = var.region
2727
}
2828

2929
resource "random_shuffle" "available_zones" {
@@ -35,7 +35,7 @@ locals {
3535
kubernetes_version_regional = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.region.latest_master_version
3636
kubernetes_version_zonal = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.zone.latest_master_version
3737
node_version_regional = var.node_version != "" && var.regional ? var.node_version : local.kubernetes_version_regional
38-
node_version_zonal = var.node_version != "" && !var.regional ? var.node_version : local.kubernetes_version_zonal
38+
node_version_zonal = var.node_version != "" && ! var.regional ? var.node_version : local.kubernetes_version_zonal
3939
custom_kube_dns_config = length(keys(var.stub_domains)) > 0
4040
upstream_nameservers_config = length(var.upstream_nameservers) > 0
4141
network_project_id = var.network_project_id != "" ? var.network_project_id : var.project_id
@@ -46,8 +46,8 @@ locals {
4646
cluster_network_policy = var.network_policy ? [{
4747
enabled = true
4848
provider = var.network_policy_provider
49-
}] : [{
50-
enabled = false
49+
}] : [{
50+
enabled = false
5151
provider = null
5252
}]
5353

@@ -247,10 +247,10 @@ locals {
247247
cluster_monitoring_service = local.cluster_type_output_monitoring_service[local.cluster_type]
248248
cluster_node_pools_names = local.cluster_type_output_node_pools_names[local.cluster_type]
249249
cluster_node_pools_versions = local.cluster_type_output_node_pools_versions[local.cluster_type]
250-
cluster_network_policy_enabled = !local.cluster_type_output_network_policy_enabled[local.cluster_type]
251-
cluster_http_load_balancing_enabled = !local.cluster_type_output_http_load_balancing_enabled[local.cluster_type]
252-
cluster_horizontal_pod_autoscaling_enabled = !local.cluster_type_output_horizontal_pod_autoscaling_enabled[local.cluster_type]
253-
cluster_kubernetes_dashboard_enabled = !local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type]
250+
cluster_network_policy_enabled = ! local.cluster_type_output_network_policy_enabled[local.cluster_type]
251+
cluster_http_load_balancing_enabled = ! local.cluster_type_output_http_load_balancing_enabled[local.cluster_type]
252+
cluster_horizontal_pod_autoscaling_enabled = ! local.cluster_type_output_horizontal_pod_autoscaling_enabled[local.cluster_type]
253+
cluster_kubernetes_dashboard_enabled = ! local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type]
254254
}
255255

256256
/******************************************

‎modules/beta-private-cluster/main.tf

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
data "google_compute_zones" "available" {
2323
provider = google-beta
2424

25-
project = var.project_id
26-
region = var.region
25+
project = var.project_id
26+
region = var.region
2727
}
2828

2929
resource "random_shuffle" "available_zones" {
@@ -35,7 +35,7 @@ locals {
3535
kubernetes_version_regional = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.region.latest_master_version
3636
kubernetes_version_zonal = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.zone.latest_master_version
3737
node_version_regional = var.node_version != "" && var.regional ? var.node_version : local.kubernetes_version_regional
38-
node_version_zonal = var.node_version != "" && !var.regional ? var.node_version : local.kubernetes_version_zonal
38+
node_version_zonal = var.node_version != "" && ! var.regional ? var.node_version : local.kubernetes_version_zonal
3939
custom_kube_dns_config = length(keys(var.stub_domains)) > 0
4040
upstream_nameservers_config = length(var.upstream_nameservers) > 0
4141
network_project_id = var.network_project_id != "" ? var.network_project_id : var.project_id
@@ -46,12 +46,12 @@ locals {
4646
cluster_network_policy = var.network_policy ? [{
4747
enabled = true
4848
provider = var.network_policy_provider
49-
}] : [{
50-
enabled = false
49+
}] : [{
50+
enabled = false
5151
provider = null
5252
}]
5353

54-
cluster_cloudrun_config = var.cloudrun ? [{disabled = false}] : []
54+
cluster_cloudrun_config = var.cloudrun ? [{ disabled = false }] : []
5555

5656
cluster_node_metadata_config = var.node_metadata == "UNSPECIFIED" ? [] : [{
5757
node_metadata = var.node_metadata
@@ -262,12 +262,12 @@ locals {
262262
cluster_monitoring_service = local.cluster_type_output_monitoring_service[local.cluster_type]
263263
cluster_node_pools_names = local.cluster_type_output_node_pools_names[local.cluster_type]
264264
cluster_node_pools_versions = local.cluster_type_output_node_pools_versions[local.cluster_type]
265-
cluster_network_policy_enabled = !local.cluster_type_output_network_policy_enabled[local.cluster_type]
266-
cluster_http_load_balancing_enabled = !local.cluster_type_output_http_load_balancing_enabled[local.cluster_type]
267-
cluster_horizontal_pod_autoscaling_enabled = !local.cluster_type_output_horizontal_pod_autoscaling_enabled[local.cluster_type]
268-
cluster_kubernetes_dashboard_enabled = !local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type]
265+
cluster_network_policy_enabled = ! local.cluster_type_output_network_policy_enabled[local.cluster_type]
266+
cluster_http_load_balancing_enabled = ! local.cluster_type_output_http_load_balancing_enabled[local.cluster_type]
267+
cluster_horizontal_pod_autoscaling_enabled = ! local.cluster_type_output_horizontal_pod_autoscaling_enabled[local.cluster_type]
268+
cluster_kubernetes_dashboard_enabled = ! local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type]
269269
# BETA features
270-
cluster_istio_enabled = !local.cluster_type_output_istio_enabled[local.cluster_type]
270+
cluster_istio_enabled = ! local.cluster_type_output_istio_enabled[local.cluster_type]
271271
cluster_cloudrun_enabled = var.cloudrun
272272
cluster_pod_security_policy_enabled = local.cluster_type_output_pod_security_policy_enabled[local.cluster_type]
273273
# /BETA features

‎modules/beta-private-cluster/variables.tf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ variable "node_version" {
7878
}
7979

8080
variable "master_authorized_networks_config" {
81-
type = list(object({cidr_blocks = list(object({cidr_block = string, display_name = string}))}))
81+
type = list(object({ cidr_blocks = list(object({ cidr_block = string, display_name = string })) }))
8282
description = "The desired configuration options for master authorized networks. The object format is {cidr_blocks = list(object({cidr_block = string, display_name = string}))}. Omit the nested cidr_blocks attribute to disallow external access (except the cluster node IPs, which GKE automatically whitelists)."
8383
default = []
8484
}
@@ -179,7 +179,7 @@ variable "node_pools_metadata" {
179179
}
180180

181181
variable "node_pools_taints" {
182-
type = map(list(object({key=string,value=string,effect=string})))
182+
type = map(list(object({ key = string, value = string, effect = string })))
183183
description = "Map of lists containing node taints by node-pool name"
184184

185185
default = {
@@ -322,10 +322,10 @@ variable "istio" {
322322

323323
variable "database_encryption" {
324324
description = "Application-layer Secrets Encryption settings. The object format is {state = string, key_name = string}. Valid values of state are: \"ENCRYPTED\"; \"DECRYPTED\". key_name is the name of a CloudKMS key."
325-
type = list(object({state = string, key_name = string}))
326-
default = [{
327-
state = "DECRYPTED"
328-
key_name = ""
325+
type = list(object({ state = string, key_name = string }))
326+
default = [{
327+
state = "DECRYPTED"
328+
key_name = ""
329329
}]
330330
}
331331

@@ -341,7 +341,7 @@ variable "enable_binary_authorization" {
341341

342342
variable "pod_security_policy_config" {
343343
description = "enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created."
344-
default = [{
344+
default = [{
345345
"enabled" = false
346346
}]
347347
}

‎modules/beta-public-cluster/main.tf

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
data "google_compute_zones" "available" {
2323
provider = google-beta
2424

25-
project = var.project_id
26-
region = var.region
25+
project = var.project_id
26+
region = var.region
2727
}
2828

2929
resource "random_shuffle" "available_zones" {
@@ -35,7 +35,7 @@ locals {
3535
kubernetes_version_regional = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.region.latest_master_version
3636
kubernetes_version_zonal = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.zone.latest_master_version
3737
node_version_regional = var.node_version != "" && var.regional ? var.node_version : local.kubernetes_version_regional
38-
node_version_zonal = var.node_version != "" && !var.regional ? var.node_version : local.kubernetes_version_zonal
38+
node_version_zonal = var.node_version != "" && ! var.regional ? var.node_version : local.kubernetes_version_zonal
3939
custom_kube_dns_config = length(keys(var.stub_domains)) > 0
4040
upstream_nameservers_config = length(var.upstream_nameservers) > 0
4141
network_project_id = var.network_project_id != "" ? var.network_project_id : var.project_id
@@ -46,12 +46,12 @@ locals {
4646
cluster_network_policy = var.network_policy ? [{
4747
enabled = true
4848
provider = var.network_policy_provider
49-
}] : [{
50-
enabled = false
49+
}] : [{
50+
enabled = false
5151
provider = null
5252
}]
5353

54-
cluster_cloudrun_config = var.cloudrun ? [{disabled = false}] : []
54+
cluster_cloudrun_config = var.cloudrun ? [{ disabled = false }] : []
5555

5656
cluster_node_metadata_config = var.node_metadata == "UNSPECIFIED" ? [] : [{
5757
node_metadata = var.node_metadata
@@ -264,12 +264,12 @@ locals {
264264
cluster_monitoring_service = local.cluster_type_output_monitoring_service[local.cluster_type]
265265
cluster_node_pools_names = local.cluster_type_output_node_pools_names[local.cluster_type]
266266
cluster_node_pools_versions = local.cluster_type_output_node_pools_versions[local.cluster_type]
267-
cluster_network_policy_enabled = !local.cluster_type_output_network_policy_enabled[local.cluster_type]
268-
cluster_http_load_balancing_enabled = !local.cluster_type_output_http_load_balancing_enabled[local.cluster_type]
269-
cluster_horizontal_pod_autoscaling_enabled = !local.cluster_type_output_horizontal_pod_autoscaling_enabled[local.cluster_type]
270-
cluster_kubernetes_dashboard_enabled = !local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type]
267+
cluster_network_policy_enabled = ! local.cluster_type_output_network_policy_enabled[local.cluster_type]
268+
cluster_http_load_balancing_enabled = ! local.cluster_type_output_http_load_balancing_enabled[local.cluster_type]
269+
cluster_horizontal_pod_autoscaling_enabled = ! local.cluster_type_output_horizontal_pod_autoscaling_enabled[local.cluster_type]
270+
cluster_kubernetes_dashboard_enabled = ! local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type]
271271
# BETA features
272-
cluster_istio_enabled = !local.cluster_type_output_istio_enabled[local.cluster_type]
272+
cluster_istio_enabled = ! local.cluster_type_output_istio_enabled[local.cluster_type]
273273
cluster_cloudrun_enabled = var.cloudrun
274274
cluster_pod_security_policy_enabled = local.cluster_type_output_pod_security_policy_enabled[local.cluster_type]
275275
# /BETA features

‎modules/beta-public-cluster/variables.tf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ variable "node_version" {
7878
}
7979

8080
variable "master_authorized_networks_config" {
81-
type = list(object({cidr_blocks = list(object({cidr_block = string, display_name = string}))}))
81+
type = list(object({ cidr_blocks = list(object({ cidr_block = string, display_name = string })) }))
8282
description = "The desired configuration options for master authorized networks. The object format is {cidr_blocks = list(object({cidr_block = string, display_name = string}))}. Omit the nested cidr_blocks attribute to disallow external access (except the cluster node IPs, which GKE automatically whitelists)."
8383
default = []
8484
}
@@ -179,7 +179,7 @@ variable "node_pools_metadata" {
179179
}
180180

181181
variable "node_pools_taints" {
182-
type = map(list(object({key=string,value=string,effect=string})))
182+
type = map(list(object({ key = string, value = string, effect = string })))
183183
description = "Map of lists containing node taints by node-pool name"
184184

185185
default = {
@@ -298,10 +298,10 @@ variable "istio" {
298298

299299
variable "database_encryption" {
300300
description = "Application-layer Secrets Encryption settings. The object format is {state = string, key_name = string}. Valid values of state are: \"ENCRYPTED\"; \"DECRYPTED\". key_name is the name of a CloudKMS key."
301-
type = list(object({state = string, key_name = string}))
302-
default = [{
303-
state = "DECRYPTED"
304-
key_name = ""
301+
type = list(object({ state = string, key_name = string }))
302+
default = [{
303+
state = "DECRYPTED"
304+
key_name = ""
305305
}]
306306
}
307307

@@ -317,7 +317,7 @@ variable "enable_binary_authorization" {
317317

318318
variable "pod_security_policy_config" {
319319
description = "enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created."
320-
default = [{
320+
default = [{
321321
"enabled" = false
322322
}]
323323
}

‎modules/private-cluster/main.tf

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
data "google_compute_zones" "available" {
2323
provider = google-beta
2424

25-
project = var.project_id
26-
region = var.region
25+
project = var.project_id
26+
region = var.region
2727
}
2828

2929
resource "random_shuffle" "available_zones" {
@@ -35,7 +35,7 @@ locals {
3535
kubernetes_version_regional = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.region.latest_master_version
3636
kubernetes_version_zonal = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.zone.latest_master_version
3737
node_version_regional = var.node_version != "" && var.regional ? var.node_version : local.kubernetes_version_regional
38-
node_version_zonal = var.node_version != "" && !var.regional ? var.node_version : local.kubernetes_version_zonal
38+
node_version_zonal = var.node_version != "" && ! var.regional ? var.node_version : local.kubernetes_version_zonal
3939
custom_kube_dns_config = length(keys(var.stub_domains)) > 0
4040
upstream_nameservers_config = length(var.upstream_nameservers) > 0
4141
network_project_id = var.network_project_id != "" ? var.network_project_id : var.project_id
@@ -46,8 +46,8 @@ locals {
4646
cluster_network_policy = var.network_policy ? [{
4747
enabled = true
4848
provider = var.network_policy_provider
49-
}] : [{
50-
enabled = false
49+
}] : [{
50+
enabled = false
5151
provider = null
5252
}]
5353

@@ -245,10 +245,10 @@ locals {
245245
cluster_monitoring_service = local.cluster_type_output_monitoring_service[local.cluster_type]
246246
cluster_node_pools_names = local.cluster_type_output_node_pools_names[local.cluster_type]
247247
cluster_node_pools_versions = local.cluster_type_output_node_pools_versions[local.cluster_type]
248-
cluster_network_policy_enabled = !local.cluster_type_output_network_policy_enabled[local.cluster_type]
249-
cluster_http_load_balancing_enabled = !local.cluster_type_output_http_load_balancing_enabled[local.cluster_type]
250-
cluster_horizontal_pod_autoscaling_enabled = !local.cluster_type_output_horizontal_pod_autoscaling_enabled[local.cluster_type]
251-
cluster_kubernetes_dashboard_enabled = !local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type]
248+
cluster_network_policy_enabled = ! local.cluster_type_output_network_policy_enabled[local.cluster_type]
249+
cluster_http_load_balancing_enabled = ! local.cluster_type_output_http_load_balancing_enabled[local.cluster_type]
250+
cluster_horizontal_pod_autoscaling_enabled = ! local.cluster_type_output_horizontal_pod_autoscaling_enabled[local.cluster_type]
251+
cluster_kubernetes_dashboard_enabled = ! local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type]
252252
}
253253

254254
/******************************************

‎modules/private-cluster/variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ variable "node_version" {
7878
}
7979

8080
variable "master_authorized_networks_config" {
81-
type = list(object({cidr_blocks = list(object({cidr_block = string, display_name = string}))}))
81+
type = list(object({ cidr_blocks = list(object({ cidr_block = string, display_name = string })) }))
8282
description = "The desired configuration options for master authorized networks. The object format is {cidr_blocks = list(object({cidr_block = string, display_name = string}))}. Omit the nested cidr_blocks attribute to disallow external access (except the cluster node IPs, which GKE automatically whitelists)."
8383
default = []
8484
}
@@ -179,7 +179,7 @@ variable "node_pools_metadata" {
179179
}
180180

181181
variable "node_pools_taints" {
182-
type = map(list(object({key=string,value=string,effect=string})))
182+
type = map(list(object({ key = string, value = string, effect = string })))
183183
description = "Map of lists containing node taints by node-pool name"
184184

185185
default = {

‎variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ variable "node_version" {
7878
}
7979

8080
variable "master_authorized_networks_config" {
81-
type = list(object({cidr_blocks = list(object({cidr_block = string, display_name = string}))}))
81+
type = list(object({ cidr_blocks = list(object({ cidr_block = string, display_name = string })) }))
8282
description = "The desired configuration options for master authorized networks. The object format is {cidr_blocks = list(object({cidr_block = string, display_name = string}))}. Omit the nested cidr_blocks attribute to disallow external access (except the cluster node IPs, which GKE automatically whitelists)."
8383
default = []
8484
}
@@ -179,7 +179,7 @@ variable "node_pools_metadata" {
179179
}
180180

181181
variable "node_pools_taints" {
182-
type = map(list(object({key=string,value=string,effect=string})))
182+
type = map(list(object({ key = string, value = string, effect = string })))
183183
description = "Map of lists containing node taints by node-pool name"
184184

185185
default = {

0 commit comments

Comments
 (0)