commit formatting changes from make generate

terraform-google-modules · Feb 13, 2019 · 9229f9d · 9229f9d
1 parent 41ea0d0
commit 9229f9d
Show file tree

Hide file tree

Showing 17 changed files with 23 additions and 30 deletions.
diff --git a/auth.tf b/auth.tf
@@ -31,4 +31,4 @@ provider "kubernetes" {
   host                   = "https://${local.cluster_endpoint}"
   token                  = "${data.google_client_config.default.access_token}"
   cluster_ca_certificate = "${base64decode(local.cluster_ca_certificate)}"
-}
+}
diff --git a/cluster_regional.tf b/cluster_regional.tf
@@ -85,7 +85,6 @@ resource "google_container_cluster" "primary" {
       service_account = "${lookup(var.node_pools[0], "service_account", var.service_account)}"
     }
   }
-
   remove_default_node_pool = "${var.remove_default_node_pool}"
 }
 
@@ -156,4 +155,4 @@ resource "null_resource" "wait_for_regional_cluster" {
   }
 
   depends_on = ["google_container_cluster.primary", "google_container_node_pool.pools"]
-}
+}
diff --git a/cluster_zonal.tf b/cluster_zonal.tf
@@ -85,7 +85,6 @@ resource "google_container_cluster" "zonal_primary" {
       service_account = "${lookup(var.node_pools[0], "service_account", var.service_account)}"
     }
   }
-
   remove_default_node_pool = "${var.remove_default_node_pool}"
 }
 
@@ -156,4 +155,4 @@ resource "null_resource" "wait_for_zonal_cluster" {
   }
 
   depends_on = ["google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"]
-}
+}
diff --git a/dns.tf b/dns.tf
@@ -51,4 +51,4 @@ EOF
   }
 
   depends_on = ["null_resource.delete_default_kube_dns_configmap", "data.google_client_config.default", "google_container_cluster.primary", "google_container_node_pool.pools", "google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"]
-}
+}
diff --git a/main.tf b/main.tf
@@ -152,4 +152,4 @@ data "google_container_engine_versions" "region" {
   provider = "google"
   zone     = "${data.google_compute_zones.available.names[0]}"
   project  = "${var.project_id}"
-}
+}
diff --git a/masq.tf b/masq.tf
@@ -41,4 +41,4 @@ EOF
   }
 
   depends_on = ["data.google_client_config.default", "google_container_cluster.primary", "google_container_node_pool.pools", "google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"]
-}
+}
diff --git a/modules/private-cluster/auth.tf b/modules/private-cluster/auth.tf
@@ -31,4 +31,4 @@ provider "kubernetes" {
   host                   = "https://${local.cluster_endpoint}"
   token                  = "${data.google_client_config.default.access_token}"
   cluster_ca_certificate = "${base64decode(local.cluster_ca_certificate)}"
-}
+}
diff --git a/modules/private-cluster/cluster_regional.tf b/modules/private-cluster/cluster_regional.tf
@@ -85,13 +85,11 @@ resource "google_container_cluster" "primary" {
       service_account = "${lookup(var.node_pools[0], "service_account", var.service_account)}"
     }
   }
-
   private_cluster_config {
     enable_private_endpoint = "${var.enable_private_endpoint}"
     enable_private_nodes    = "${var.enable_private_nodes}"
     master_ipv4_cidr_block  = "${var.master_ipv4_cidr_block}"
   }
-
   remove_default_node_pool = "${var.remove_default_node_pool}"
 }
 
@@ -162,4 +160,4 @@ resource "null_resource" "wait_for_regional_cluster" {
   }
 
   depends_on = ["google_container_cluster.primary", "google_container_node_pool.pools"]
-}
+}
diff --git a/modules/private-cluster/cluster_zonal.tf b/modules/private-cluster/cluster_zonal.tf
@@ -85,13 +85,11 @@ resource "google_container_cluster" "zonal_primary" {
       service_account = "${lookup(var.node_pools[0], "service_account", var.service_account)}"
     }
   }
-
   private_cluster_config {
     enable_private_endpoint = "${var.enable_private_endpoint}"
     enable_private_nodes    = "${var.enable_private_nodes}"
     master_ipv4_cidr_block  = "${var.master_ipv4_cidr_block}"
   }
-
   remove_default_node_pool = "${var.remove_default_node_pool}"
 }
 
@@ -162,4 +160,4 @@ resource "null_resource" "wait_for_zonal_cluster" {
   }
 
   depends_on = ["google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"]
-}
+}
diff --git a/modules/private-cluster/dns.tf b/modules/private-cluster/dns.tf
@@ -51,4 +51,4 @@ EOF
   }
 
   depends_on = ["null_resource.delete_default_kube_dns_configmap", "data.google_client_config.default", "google_container_cluster.primary", "google_container_node_pool.pools", "google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"]
-}
+}
diff --git a/modules/private-cluster/masq.tf b/modules/private-cluster/masq.tf
@@ -41,4 +41,4 @@ EOF
   }
 
   depends_on = ["data.google_client_config.default", "google_container_cluster.primary", "google_container_node_pool.pools", "google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"]
-}
+}
diff --git a/modules/private-cluster/networks.tf b/modules/private-cluster/networks.tf
@@ -27,4 +27,4 @@ data "google_compute_subnetwork" "gke_subnetwork" {
   name     = "${var.subnetwork}"
   region   = "${var.region}"
   project  = "${local.network_project_id}"
-}
+}
diff --git a/modules/private-cluster/outputs.tf b/modules/private-cluster/outputs.tf
@@ -106,4 +106,4 @@ output "node_pools_names" {
 output "node_pools_versions" {
   description = "List of node pools versions"
   value       = "${local.cluster_node_pools_versions}"
-}
+}
diff --git a/modules/private-cluster/variables.tf b/modules/private-cluster/variables.tf
@@ -220,18 +220,17 @@ variable "service_account" {
   description = "The service account to default running nodes as if not overridden in `node_pools`. Defaults to the compute engine default service account"
   default     = ""
 }
-
 variable "enable_private_endpoint" {
-  description = "(Beta) Whether the master's internal IP address is used as the cluster endpoint"
-  default     = false
+  description  = "(Beta) Whether the master's internal IP address is used as the cluster endpoint"
+  default      = false
 }
 
 variable "enable_private_nodes" {
-  description = "(Beta) Whether nodes have internal IP addresses only"
-  default     = false
+  description  = "(Beta) Whether nodes have internal IP addresses only"
+  default      = false
 }
 
 variable "master_ipv4_cidr_block" {
-  description = "(Beta) The IP range in CIDR notation to use for the hosted master network"
-  default     = "10.0.0.0/28"
-}
+  description  = "(Beta) The IP range in CIDR notation to use for the hosted master network"
+  default      = "10.0.0.0/28"
+}
diff --git a/networks.tf b/networks.tf
@@ -27,4 +27,4 @@ data "google_compute_subnetwork" "gke_subnetwork" {
   name     = "${var.subnetwork}"
   region   = "${var.region}"
   project  = "${local.network_project_id}"
-}
+}
diff --git a/outputs.tf b/outputs.tf
@@ -106,4 +106,4 @@ output "node_pools_names" {
 output "node_pools_versions" {
   description = "List of node pools versions"
   value       = "${local.cluster_node_pools_versions}"
-}
+}
diff --git a/variables.tf b/variables.tf
@@ -219,4 +219,4 @@ variable "monitoring_service" {
 variable "service_account" {
   description = "The service account to default running nodes as if not overridden in `node_pools`. Defaults to the compute engine default service account"
   default     = ""
-}
+}