From 025babd6e11441443ed6ff67d0b1ed72b48a4d95 Mon Sep 17 00:00:00 2001 From: Aaron Lane Date: Fri, 12 Apr 2019 17:18:39 -0400 Subject: [PATCH] Regenerate modules --- auth.tf | 2 +- cluster_regional.tf | 2 +- cluster_zonal.tf | 2 +- dns.tf | 2 +- masq.tf | 2 +- modules/private-cluster/auth.tf | 2 +- modules/private-cluster/cluster_regional.tf | 2 +- modules/private-cluster/cluster_zonal.tf | 2 +- modules/private-cluster/dns.tf | 2 +- modules/private-cluster/masq.tf | 2 +- modules/private-cluster/networks.tf | 2 +- modules/private-cluster/outputs.tf | 4 ++-- modules/private-cluster/sa.tf | 2 +- .../private-cluster/scripts/delete-default-resource.sh | 2 +- modules/private-cluster/scripts/kubectl_wrapper.sh | 2 +- modules/private-cluster/scripts/wait-for-cluster.sh | 2 +- modules/private-cluster/variables.tf | 8 ++++---- networks.tf | 2 +- outputs.tf | 4 ++-- sa.tf | 2 +- scripts/delete-default-resource.sh | 2 +- scripts/kubectl_wrapper.sh | 2 +- scripts/wait-for-cluster.sh | 2 +- variables.tf | 8 ++++---- 24 files changed, 32 insertions(+), 32 deletions(-) diff --git a/auth.tf b/auth.tf index 4ec9fefa18..5ad4160145 100644 --- 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)}" -} \ No newline at end of file +} diff --git a/cluster_regional.tf b/cluster_regional.tf index aba0a27421..79a471b630 100644 --- a/cluster_regional.tf +++ b/cluster_regional.tf @@ -163,4 +163,4 @@ resource "null_resource" "wait_for_regional_cluster" { } depends_on = ["google_container_cluster.primary", "google_container_node_pool.pools"] -} \ No newline at end of file +} diff --git a/cluster_zonal.tf b/cluster_zonal.tf index 952245e03d..5a9e9f4688 100644 --- a/cluster_zonal.tf +++ b/cluster_zonal.tf @@ -163,4 +163,4 @@ resource "null_resource" "wait_for_zonal_cluster" { } depends_on = ["google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"] -} \ No newline at end of file +} diff --git a/dns.tf b/dns.tf index 56d702e00a..25effe580a 100644 --- 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"] -} \ No newline at end of file +} diff --git a/masq.tf b/masq.tf index 36ce6e21a8..a78d263cef 100644 --- 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"] -} \ No newline at end of file +} diff --git a/modules/private-cluster/auth.tf b/modules/private-cluster/auth.tf index 56e015b1ef..0bbafaf4a2 100644 --- 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)}" -} \ No newline at end of file +} diff --git a/modules/private-cluster/cluster_regional.tf b/modules/private-cluster/cluster_regional.tf index a5e594ff1d..da9220a4fd 100644 --- a/modules/private-cluster/cluster_regional.tf +++ b/modules/private-cluster/cluster_regional.tf @@ -169,4 +169,4 @@ resource "null_resource" "wait_for_regional_cluster" { } depends_on = ["google_container_cluster.primary", "google_container_node_pool.pools"] -} \ No newline at end of file +} diff --git a/modules/private-cluster/cluster_zonal.tf b/modules/private-cluster/cluster_zonal.tf index 34e0c641d3..b55858b682 100644 --- a/modules/private-cluster/cluster_zonal.tf +++ b/modules/private-cluster/cluster_zonal.tf @@ -169,4 +169,4 @@ resource "null_resource" "wait_for_zonal_cluster" { } depends_on = ["google_container_cluster.zonal_primary", "google_container_node_pool.zonal_pools"] -} \ No newline at end of file +} diff --git a/modules/private-cluster/dns.tf b/modules/private-cluster/dns.tf index 56d702e00a..25effe580a 100644 --- 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"] -} \ No newline at end of file +} diff --git a/modules/private-cluster/masq.tf b/modules/private-cluster/masq.tf index 36ce6e21a8..a78d263cef 100644 --- 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"] -} \ No newline at end of file +} diff --git a/modules/private-cluster/networks.tf b/modules/private-cluster/networks.tf index 9d8f7394c2..aeb1a99aba 100644 --- 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}" -} \ No newline at end of file +} diff --git a/modules/private-cluster/outputs.tf b/modules/private-cluster/outputs.tf index 455f69790a..6b9d5895ab 100644 --- a/modules/private-cluster/outputs.tf +++ b/modules/private-cluster/outputs.tf @@ -110,5 +110,5 @@ output "node_pools_versions" { output "service_account" { description = "The service account to default running nodes as if not overridden in `node_pools`." - value = "${local.service_account}" -} \ No newline at end of file + value = "${local.service_account}" +} diff --git a/modules/private-cluster/sa.tf b/modules/private-cluster/sa.tf index 0b119e41f6..5a08b8885d 100644 --- a/modules/private-cluster/sa.tf +++ b/modules/private-cluster/sa.tf @@ -54,4 +54,4 @@ resource "google_project_iam_member" "cluster_service_account-monitoring_viewer" project = "${google_project_iam_member.cluster_service_account-metric_writer.project}" role = "roles/monitoring.viewer" member = "serviceAccount:${google_service_account.cluster_service_account.email}" -} \ No newline at end of file +} diff --git a/modules/private-cluster/scripts/delete-default-resource.sh b/modules/private-cluster/scripts/delete-default-resource.sh index 72723210e1..32b2f51a41 100755 --- a/modules/private-cluster/scripts/delete-default-resource.sh +++ b/modules/private-cluster/scripts/delete-default-resource.sh @@ -38,4 +38,4 @@ if [[ $RESOURCE_LIST = *"${RESOURCE_NAME}"* ]]; then fi else echo "No default ${RESOURCE_NAME} ${RESOURCE_TYPE} found in ${RESOURCE_NAMESPACE} namespace" -fi \ No newline at end of file +fi diff --git a/modules/private-cluster/scripts/kubectl_wrapper.sh b/modules/private-cluster/scripts/kubectl_wrapper.sh index 255c128223..e92300bcb5 100755 --- a/modules/private-cluster/scripts/kubectl_wrapper.sh +++ b/modules/private-cluster/scripts/kubectl_wrapper.sh @@ -50,4 +50,4 @@ kubectl config set-credentials kubectl-wrapper --token="${TOKEN}" 1>/dev/null kubectl config use-context kubectl-wrapper 1>/dev/null kubectl version 1>/dev/null -"$@" \ No newline at end of file +"$@" diff --git a/modules/private-cluster/scripts/wait-for-cluster.sh b/modules/private-cluster/scripts/wait-for-cluster.sh index 3ea1dd78ed..6ff3253d58 100755 --- a/modules/private-cluster/scripts/wait-for-cluster.sh +++ b/modules/private-cluster/scripts/wait-for-cluster.sh @@ -30,4 +30,4 @@ while [[ "${current_status}" == "RECONCILING" ]]; do current_status=$($gcloud_command | jq -r "$jq_query") done -echo "Cluster is ready!" \ No newline at end of file +echo "Cluster is ready!" diff --git a/modules/private-cluster/variables.tf b/modules/private-cluster/variables.tf index 5d5a06ee96..7f374f81c3 100644 --- a/modules/private-cluster/variables.tf +++ b/modules/private-cluster/variables.tf @@ -244,15 +244,15 @@ variable "master_ipv4_cidr_block" { variable "basic_auth_username" { description = "The username to be used with Basic Authentication. An empty value will disable Basic Authentication, which is the recommended configuration." - default = "" + default = "" } variable "basic_auth_password" { description = "The password to be used with Basic Authentication." - default = "" + default = "" } variable "issue_client_certificate" { description = "Issues a client certificate to authenticate to the cluster endpoint. To maximize the security of your cluster, leave this option disabled. Client certificates don't automatically rotate and aren't easily revocable. WARNING: changing this after cluster creation is destructive!" - default = "false" -} \ No newline at end of file + default = "false" +} diff --git a/networks.tf b/networks.tf index f1cd380a73..f6c26d9e77 100644 --- 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}" -} \ No newline at end of file +} diff --git a/outputs.tf b/outputs.tf index 455f69790a..6b9d5895ab 100644 --- a/outputs.tf +++ b/outputs.tf @@ -110,5 +110,5 @@ output "node_pools_versions" { output "service_account" { description = "The service account to default running nodes as if not overridden in `node_pools`." - value = "${local.service_account}" -} \ No newline at end of file + value = "${local.service_account}" +} diff --git a/sa.tf b/sa.tf index 0b119e41f6..5a08b8885d 100644 --- a/sa.tf +++ b/sa.tf @@ -54,4 +54,4 @@ resource "google_project_iam_member" "cluster_service_account-monitoring_viewer" project = "${google_project_iam_member.cluster_service_account-metric_writer.project}" role = "roles/monitoring.viewer" member = "serviceAccount:${google_service_account.cluster_service_account.email}" -} \ No newline at end of file +} diff --git a/scripts/delete-default-resource.sh b/scripts/delete-default-resource.sh index 72723210e1..32b2f51a41 100755 --- a/scripts/delete-default-resource.sh +++ b/scripts/delete-default-resource.sh @@ -38,4 +38,4 @@ if [[ $RESOURCE_LIST = *"${RESOURCE_NAME}"* ]]; then fi else echo "No default ${RESOURCE_NAME} ${RESOURCE_TYPE} found in ${RESOURCE_NAMESPACE} namespace" -fi \ No newline at end of file +fi diff --git a/scripts/kubectl_wrapper.sh b/scripts/kubectl_wrapper.sh index 255c128223..e92300bcb5 100755 --- a/scripts/kubectl_wrapper.sh +++ b/scripts/kubectl_wrapper.sh @@ -50,4 +50,4 @@ kubectl config set-credentials kubectl-wrapper --token="${TOKEN}" 1>/dev/null kubectl config use-context kubectl-wrapper 1>/dev/null kubectl version 1>/dev/null -"$@" \ No newline at end of file +"$@" diff --git a/scripts/wait-for-cluster.sh b/scripts/wait-for-cluster.sh index 3ea1dd78ed..6ff3253d58 100755 --- a/scripts/wait-for-cluster.sh +++ b/scripts/wait-for-cluster.sh @@ -30,4 +30,4 @@ while [[ "${current_status}" == "RECONCILING" ]]; do current_status=$($gcloud_command | jq -r "$jq_query") done -echo "Cluster is ready!" \ No newline at end of file +echo "Cluster is ready!" diff --git a/variables.tf b/variables.tf index bdb9a8f0c0..26d3b30df7 100644 --- a/variables.tf +++ b/variables.tf @@ -229,15 +229,15 @@ variable "service_account" { variable "basic_auth_username" { description = "The username to be used with Basic Authentication. An empty value will disable Basic Authentication, which is the recommended configuration." - default = "" + default = "" } variable "basic_auth_password" { description = "The password to be used with Basic Authentication." - default = "" + default = "" } variable "issue_client_certificate" { description = "Issues a client certificate to authenticate to the cluster endpoint. To maximize the security of your cluster, leave this option disabled. Client certificates don't automatically rotate and aren't easily revocable. WARNING: changing this after cluster creation is destructive!" - default = "false" -} \ No newline at end of file + default = "false" +}