Skip to content

Commit

Permalink
Regenerate/fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dev25
Dev25 committed Jul 22, 2019
1 parent b0625cb commit 278e52f
Show file tree
Hide file tree
Showing 8 changed files with 58 additions and 58 deletions.
18 changes: 9 additions & 9 deletions main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
data "google_compute_zones" "available" {
provider = google

project = var.project_id
region = var.region
project = var.project_id
region = var.region
}

resource "random_shuffle" "available_zones" {
Expand All @@ -35,7 +35,7 @@ locals {
kubernetes_version_regional = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.region.latest_master_version
kubernetes_version_zonal = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.zone.latest_master_version
node_version_regional = var.node_version != "" && var.regional ? var.node_version : local.kubernetes_version_regional
node_version_zonal = var.node_version != "" && !var.regional ? var.node_version : local.kubernetes_version_zonal
node_version_zonal = var.node_version != "" && ! var.regional ? var.node_version : local.kubernetes_version_zonal
custom_kube_dns_config = length(keys(var.stub_domains)) > 0
upstream_nameservers_config = length(var.upstream_nameservers) > 0
network_project_id = var.network_project_id != "" ? var.network_project_id : var.project_id
Expand All @@ -46,8 +46,8 @@ locals {
cluster_network_policy = var.network_policy ? [{
enabled = true
provider = var.network_policy_provider
}] : [{
enabled = false
}] : [{
enabled = false
provider = null
}]

Expand Down Expand Up @@ -247,10 +247,10 @@ locals {
cluster_monitoring_service = local.cluster_type_output_monitoring_service[local.cluster_type]
cluster_node_pools_names = local.cluster_type_output_node_pools_names[local.cluster_type]
cluster_node_pools_versions = local.cluster_type_output_node_pools_versions[local.cluster_type]
cluster_network_policy_enabled = !local.cluster_type_output_network_policy_enabled[local.cluster_type]
cluster_http_load_balancing_enabled = !local.cluster_type_output_http_load_balancing_enabled[local.cluster_type]
cluster_horizontal_pod_autoscaling_enabled = !local.cluster_type_output_horizontal_pod_autoscaling_enabled[local.cluster_type]
cluster_kubernetes_dashboard_enabled = !local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type]
cluster_network_policy_enabled = ! local.cluster_type_output_network_policy_enabled[local.cluster_type]
cluster_http_load_balancing_enabled = ! local.cluster_type_output_http_load_balancing_enabled[local.cluster_type]
cluster_horizontal_pod_autoscaling_enabled = ! local.cluster_type_output_horizontal_pod_autoscaling_enabled[local.cluster_type]
cluster_kubernetes_dashboard_enabled = ! local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type]
}

/******************************************
Expand Down
22 changes: 11 additions & 11 deletions modules/beta-private-cluster/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
data "google_compute_zones" "available" {
provider = google-beta

project = var.project_id
region = var.region
project = var.project_id
region = var.region
}

resource "random_shuffle" "available_zones" {
Expand All @@ -35,7 +35,7 @@ locals {
kubernetes_version_regional = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.region.latest_master_version
kubernetes_version_zonal = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.zone.latest_master_version
node_version_regional = var.node_version != "" && var.regional ? var.node_version : local.kubernetes_version_regional
node_version_zonal = var.node_version != "" && !var.regional ? var.node_version : local.kubernetes_version_zonal
node_version_zonal = var.node_version != "" && ! var.regional ? var.node_version : local.kubernetes_version_zonal
custom_kube_dns_config = length(keys(var.stub_domains)) > 0
upstream_nameservers_config = length(var.upstream_nameservers) > 0
network_project_id = var.network_project_id != "" ? var.network_project_id : var.project_id
Expand All @@ -46,12 +46,12 @@ locals {
cluster_network_policy = var.network_policy ? [{
enabled = true
provider = var.network_policy_provider
}] : [{
enabled = false
}] : [{
enabled = false
provider = null
}]

cluster_cloudrun_config = var.cloudrun ? [{disabled = false}] : []
cluster_cloudrun_config = var.cloudrun ? [{ disabled = false }] : []

cluster_node_metadata_config = var.node_metadata == "UNSPECIFIED" ? [] : [{
node_metadata = var.node_metadata
Expand Down Expand Up @@ -262,12 +262,12 @@ locals {
cluster_monitoring_service = local.cluster_type_output_monitoring_service[local.cluster_type]
cluster_node_pools_names = local.cluster_type_output_node_pools_names[local.cluster_type]
cluster_node_pools_versions = local.cluster_type_output_node_pools_versions[local.cluster_type]
cluster_network_policy_enabled = !local.cluster_type_output_network_policy_enabled[local.cluster_type]
cluster_http_load_balancing_enabled = !local.cluster_type_output_http_load_balancing_enabled[local.cluster_type]
cluster_horizontal_pod_autoscaling_enabled = !local.cluster_type_output_horizontal_pod_autoscaling_enabled[local.cluster_type]
cluster_kubernetes_dashboard_enabled = !local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type]
cluster_network_policy_enabled = ! local.cluster_type_output_network_policy_enabled[local.cluster_type]
cluster_http_load_balancing_enabled = ! local.cluster_type_output_http_load_balancing_enabled[local.cluster_type]
cluster_horizontal_pod_autoscaling_enabled = ! local.cluster_type_output_horizontal_pod_autoscaling_enabled[local.cluster_type]
cluster_kubernetes_dashboard_enabled = ! local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type]
# BETA features
cluster_istio_enabled = !local.cluster_type_output_istio_enabled[local.cluster_type]
cluster_istio_enabled = ! local.cluster_type_output_istio_enabled[local.cluster_type]
cluster_cloudrun_enabled = var.cloudrun
cluster_pod_security_policy_enabled = local.cluster_type_output_pod_security_policy_enabled[local.cluster_type]
# /BETA features
Expand Down
14 changes: 7 additions & 7 deletions modules/beta-private-cluster/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ variable "node_version" {
}

variable "master_authorized_networks_config" {
type = list(object({cidr_blocks = list(object({cidr_block = string, display_name = string}))}))
type = list(object({ cidr_blocks = list(object({ cidr_block = string, display_name = string })) }))
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)."
default = []
}
Expand Down Expand Up @@ -179,7 +179,7 @@ variable "node_pools_metadata" {
}

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

default = {
Expand Down Expand Up @@ -322,10 +322,10 @@ variable "istio" {

variable "database_encryption" {
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."
type = list(object({state = string, key_name = string}))
default = [{
state = "DECRYPTED"
key_name = ""
type = list(object({ state = string, key_name = string }))
default = [{
state = "DECRYPTED"
key_name = ""
}]
}

Expand All @@ -341,7 +341,7 @@ variable "enable_binary_authorization" {

variable "pod_security_policy_config" {
description = "enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created."
default = [{
default = [{
"enabled" = false
}]
}
Expand Down
22 changes: 11 additions & 11 deletions modules/beta-public-cluster/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
data "google_compute_zones" "available" {
provider = google-beta

project = var.project_id
region = var.region
project = var.project_id
region = var.region
}

resource "random_shuffle" "available_zones" {
Expand All @@ -35,7 +35,7 @@ locals {
kubernetes_version_regional = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.region.latest_master_version
kubernetes_version_zonal = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.zone.latest_master_version
node_version_regional = var.node_version != "" && var.regional ? var.node_version : local.kubernetes_version_regional
node_version_zonal = var.node_version != "" && !var.regional ? var.node_version : local.kubernetes_version_zonal
node_version_zonal = var.node_version != "" && ! var.regional ? var.node_version : local.kubernetes_version_zonal
custom_kube_dns_config = length(keys(var.stub_domains)) > 0
upstream_nameservers_config = length(var.upstream_nameservers) > 0
network_project_id = var.network_project_id != "" ? var.network_project_id : var.project_id
Expand All @@ -46,12 +46,12 @@ locals {
cluster_network_policy = var.network_policy ? [{
enabled = true
provider = var.network_policy_provider
}] : [{
enabled = false
}] : [{
enabled = false
provider = null
}]

cluster_cloudrun_config = var.cloudrun ? [{disabled = false}] : []
cluster_cloudrun_config = var.cloudrun ? [{ disabled = false }] : []

cluster_node_metadata_config = var.node_metadata == "UNSPECIFIED" ? [] : [{
node_metadata = var.node_metadata
Expand Down Expand Up @@ -264,12 +264,12 @@ locals {
cluster_monitoring_service = local.cluster_type_output_monitoring_service[local.cluster_type]
cluster_node_pools_names = local.cluster_type_output_node_pools_names[local.cluster_type]
cluster_node_pools_versions = local.cluster_type_output_node_pools_versions[local.cluster_type]
cluster_network_policy_enabled = !local.cluster_type_output_network_policy_enabled[local.cluster_type]
cluster_http_load_balancing_enabled = !local.cluster_type_output_http_load_balancing_enabled[local.cluster_type]
cluster_horizontal_pod_autoscaling_enabled = !local.cluster_type_output_horizontal_pod_autoscaling_enabled[local.cluster_type]
cluster_kubernetes_dashboard_enabled = !local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type]
cluster_network_policy_enabled = ! local.cluster_type_output_network_policy_enabled[local.cluster_type]
cluster_http_load_balancing_enabled = ! local.cluster_type_output_http_load_balancing_enabled[local.cluster_type]
cluster_horizontal_pod_autoscaling_enabled = ! local.cluster_type_output_horizontal_pod_autoscaling_enabled[local.cluster_type]
cluster_kubernetes_dashboard_enabled = ! local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type]
# BETA features
cluster_istio_enabled = !local.cluster_type_output_istio_enabled[local.cluster_type]
cluster_istio_enabled = ! local.cluster_type_output_istio_enabled[local.cluster_type]
cluster_cloudrun_enabled = var.cloudrun
cluster_pod_security_policy_enabled = local.cluster_type_output_pod_security_policy_enabled[local.cluster_type]
# /BETA features
Expand Down
14 changes: 7 additions & 7 deletions modules/beta-public-cluster/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ variable "node_version" {
}

variable "master_authorized_networks_config" {
type = list(object({cidr_blocks = list(object({cidr_block = string, display_name = string}))}))
type = list(object({ cidr_blocks = list(object({ cidr_block = string, display_name = string })) }))
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)."
default = []
}
Expand Down Expand Up @@ -179,7 +179,7 @@ variable "node_pools_metadata" {
}

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

default = {
Expand Down Expand Up @@ -298,10 +298,10 @@ variable "istio" {

variable "database_encryption" {
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."
type = list(object({state = string, key_name = string}))
default = [{
state = "DECRYPTED"
key_name = ""
type = list(object({ state = string, key_name = string }))
default = [{
state = "DECRYPTED"
key_name = ""
}]
}

Expand All @@ -317,7 +317,7 @@ variable "enable_binary_authorization" {

variable "pod_security_policy_config" {
description = "enabled - Enable the PodSecurityPolicy controller for this cluster. If enabled, pods must be valid under a PodSecurityPolicy to be created."
default = [{
default = [{
"enabled" = false
}]
}
Expand Down
18 changes: 9 additions & 9 deletions modules/private-cluster/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
data "google_compute_zones" "available" {
provider = google-beta

project = var.project_id
region = var.region
project = var.project_id
region = var.region
}

resource "random_shuffle" "available_zones" {
Expand All @@ -35,7 +35,7 @@ locals {
kubernetes_version_regional = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.region.latest_master_version
kubernetes_version_zonal = var.kubernetes_version != "latest" ? var.kubernetes_version : data.google_container_engine_versions.zone.latest_master_version
node_version_regional = var.node_version != "" && var.regional ? var.node_version : local.kubernetes_version_regional
node_version_zonal = var.node_version != "" && !var.regional ? var.node_version : local.kubernetes_version_zonal
node_version_zonal = var.node_version != "" && ! var.regional ? var.node_version : local.kubernetes_version_zonal
custom_kube_dns_config = length(keys(var.stub_domains)) > 0
upstream_nameservers_config = length(var.upstream_nameservers) > 0
network_project_id = var.network_project_id != "" ? var.network_project_id : var.project_id
Expand All @@ -46,8 +46,8 @@ locals {
cluster_network_policy = var.network_policy ? [{
enabled = true
provider = var.network_policy_provider
}] : [{
enabled = false
}] : [{
enabled = false
provider = null
}]

Expand Down Expand Up @@ -245,10 +245,10 @@ locals {
cluster_monitoring_service = local.cluster_type_output_monitoring_service[local.cluster_type]
cluster_node_pools_names = local.cluster_type_output_node_pools_names[local.cluster_type]
cluster_node_pools_versions = local.cluster_type_output_node_pools_versions[local.cluster_type]
cluster_network_policy_enabled = !local.cluster_type_output_network_policy_enabled[local.cluster_type]
cluster_http_load_balancing_enabled = !local.cluster_type_output_http_load_balancing_enabled[local.cluster_type]
cluster_horizontal_pod_autoscaling_enabled = !local.cluster_type_output_horizontal_pod_autoscaling_enabled[local.cluster_type]
cluster_kubernetes_dashboard_enabled = !local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type]
cluster_network_policy_enabled = ! local.cluster_type_output_network_policy_enabled[local.cluster_type]
cluster_http_load_balancing_enabled = ! local.cluster_type_output_http_load_balancing_enabled[local.cluster_type]
cluster_horizontal_pod_autoscaling_enabled = ! local.cluster_type_output_horizontal_pod_autoscaling_enabled[local.cluster_type]
cluster_kubernetes_dashboard_enabled = ! local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type]
}

/******************************************
Expand Down
4 changes: 2 additions & 2 deletions modules/private-cluster/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ variable "node_version" {
}

variable "master_authorized_networks_config" {
type = list(object({cidr_blocks = list(object({cidr_block = string, display_name = string}))}))
type = list(object({ cidr_blocks = list(object({ cidr_block = string, display_name = string })) }))
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)."
default = []
}
Expand Down Expand Up @@ -179,7 +179,7 @@ variable "node_pools_metadata" {
}

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

default = {
Expand Down
4 changes: 2 additions & 2 deletions variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ variable "node_version" {
}

variable "master_authorized_networks_config" {
type = list(object({cidr_blocks = list(object({cidr_block = string, display_name = string}))}))
type = list(object({ cidr_blocks = list(object({ cidr_block = string, display_name = string })) }))
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)."
default = []
}
Expand Down Expand Up @@ -179,7 +179,7 @@ variable "node_pools_metadata" {
}

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

default = {
Expand Down

0 comments on commit 278e52f

Please sign in to comment.