Skip to content

Commit c869b35

Browse files
committed
commit formatting changes from make generate
1 parent 40d77b7 commit c869b35

18 files changed

+24
-31
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Terraform Kubernetes Engine Module
22

3-
This module handles opinionated Google Cloud Platform Kubernetes Engine cluster creation and configuration with Node Pools, IP MASQ, Network Policy, etc.
3+
This module handles opinionated Google Cloud Platform Kubernetes Engine cluster creation and configuration with Node Pools, IP MASQ, Network Policy, etc.
44
The resources/services/activations/deletions that this module will create/trigger are:
55
- Create a GKE cluster with the provided addons
66
- Create GKE Node Pool(s) with provided configuration and attach to cluster

auth.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ provider "kubernetes" {
3131
host = "https://${local.cluster_endpoint}"
3232
token = "${data.google_client_config.default.access_token}"
3333
cluster_ca_certificate = "${base64decode(local.cluster_ca_certificate)}"
34-
}
34+
}

cluster_regional.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ resource "google_container_cluster" "primary" {
8484
service_account = "${lookup(var.node_pools[0], "service_account", var.service_account)}"
8585
}
8686
}
87-
8887
remove_default_node_pool = "${var.remove_default_node_pool}"
8988
}
9089

@@ -155,4 +154,4 @@ resource "null_resource" "wait_for_regional_cluster" {
155154
}
156155

157156
depends_on = ["google_container_cluster.primary", "google_container_node_pool.pools"]
158-
}
157+
}

cluster_zonal.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ resource "google_container_cluster" "zonal_primary" {
8484
service_account = "${lookup(var.node_pools[0], "service_account", var.service_account)}"
8585
}
8686
}
87-
8887
remove_default_node_pool = "${var.remove_default_node_pool}"
8988
}
9089

@@ -155,4 +154,4 @@ resource "null_resource" "wait_for_zonal_cluster" {
155154
}
156155

157156
depends_on = ["google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"]
158-
}
157+
}

dns.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ EOF
5151
}
5252

5353
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"]
54-
}
54+
}

main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,4 +152,4 @@ data "google_container_engine_versions" "region" {
152152
provider = "google"
153153
zone = "${data.google_compute_zones.available.names[0]}"
154154
project = "${var.project_id}"
155-
}
155+
}

masq.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ EOF
4141
}
4242

4343
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"]
44-
}
44+
}

modules/private-cluster/auth.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ provider "kubernetes" {
3131
host = "https://${local.cluster_endpoint}"
3232
token = "${data.google_client_config.default.access_token}"
3333
cluster_ca_certificate = "${base64decode(local.cluster_ca_certificate)}"
34-
}
34+
}

modules/private-cluster/cluster_regional.tf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,11 @@ resource "google_container_cluster" "primary" {
8484
service_account = "${lookup(var.node_pools[0], "service_account", var.service_account)}"
8585
}
8686
}
87-
8887
private_cluster_config {
8988
enable_private_endpoint = "${var.enable_private_endpoint}"
9089
enable_private_nodes = "${var.enable_private_nodes}"
9190
master_ipv4_cidr_block = "${var.master_ipv4_cidr_block}"
9291
}
93-
9492
remove_default_node_pool = "${var.remove_default_node_pool}"
9593
}
9694

@@ -161,4 +159,4 @@ resource "null_resource" "wait_for_regional_cluster" {
161159
}
162160

163161
depends_on = ["google_container_cluster.primary", "google_container_node_pool.pools"]
164-
}
162+
}

modules/private-cluster/cluster_zonal.tf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,11 @@ resource "google_container_cluster" "zonal_primary" {
8484
service_account = "${lookup(var.node_pools[0], "service_account", var.service_account)}"
8585
}
8686
}
87-
8887
private_cluster_config {
8988
enable_private_endpoint = "${var.enable_private_endpoint}"
9089
enable_private_nodes = "${var.enable_private_nodes}"
9190
master_ipv4_cidr_block = "${var.master_ipv4_cidr_block}"
9291
}
93-
9492
remove_default_node_pool = "${var.remove_default_node_pool}"
9593
}
9694

@@ -161,4 +159,4 @@ resource "null_resource" "wait_for_zonal_cluster" {
161159
}
162160

163161
depends_on = ["google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"]
164-
}
162+
}

modules/private-cluster/dns.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ EOF
5151
}
5252

5353
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"]
54-
}
54+
}

modules/private-cluster/masq.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ EOF
4141
}
4242

4343
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"]
44-
}
44+
}

modules/private-cluster/networks.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ data "google_compute_subnetwork" "gke_subnetwork" {
2727
name = "${var.subnetwork}"
2828
region = "${var.region}"
2929
project = "${local.network_project_id}"
30-
}
30+
}

modules/private-cluster/outputs.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,4 @@ output "node_pools_names" {
106106
output "node_pools_versions" {
107107
description = "List of node pools versions"
108108
value = "${local.cluster_node_pools_versions}"
109-
}
109+
}

modules/private-cluster/variables.tf

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -211,18 +211,17 @@ variable "service_account" {
211211
description = "The service account to default running nodes as if not overridden in `node_pools`. Defaults to the compute engine default service account"
212212
default = ""
213213
}
214-
215214
variable "enable_private_endpoint" {
216-
description = "(Beta) Whether the master's internal IP address is used as the cluster endpoint"
217-
default = false
215+
description = "(Beta) Whether the master's internal IP address is used as the cluster endpoint"
216+
default = false
218217
}
219218

220219
variable "enable_private_nodes" {
221-
description = "(Beta) Whether nodes have internal IP addresses only"
222-
default = false
220+
description = "(Beta) Whether nodes have internal IP addresses only"
221+
default = false
223222
}
224223

225224
variable "master_ipv4_cidr_block" {
226-
description = "(Beta) The IP range in CIDR notation to use for the hosted master network"
227-
default = "10.0.0.0/28"
228-
}
225+
description = "(Beta) The IP range in CIDR notation to use for the hosted master network"
226+
default = "10.0.0.0/28"
227+
}

networks.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ data "google_compute_subnetwork" "gke_subnetwork" {
2727
name = "${var.subnetwork}"
2828
region = "${var.region}"
2929
project = "${local.network_project_id}"
30-
}
30+
}

outputs.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,4 @@ output "node_pools_names" {
106106
output "node_pools_versions" {
107107
description = "List of node pools versions"
108108
value = "${local.cluster_node_pools_versions}"
109-
}
109+
}

variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,4 +210,4 @@ variable "monitoring_service" {
210210
variable "service_account" {
211211
description = "The service account to default running nodes as if not overridden in `node_pools`. Defaults to the compute engine default service account"
212212
default = ""
213-
}
213+
}

0 commit comments

Comments
 (0)