From 984b9dbefeb076d76b1c7c95813f3ac03d6498dc Mon Sep 17 00:00:00 2001 From: Eric Zhao Date: Thu, 12 Nov 2020 16:38:09 +1100 Subject: [PATCH] fix space --- autogen/main/firewall.tf.tmpl | 5 +++-- firewall.tf | 5 +++-- modules/beta-private-cluster-update-variant/firewall.tf | 5 +++-- modules/beta-private-cluster/firewall.tf | 5 +++-- modules/beta-public-cluster-update-variant/firewall.tf | 5 +++-- modules/beta-public-cluster/firewall.tf | 5 +++-- modules/private-cluster-update-variant/firewall.tf | 5 +++-- modules/private-cluster/firewall.tf | 5 +++-- 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/autogen/main/firewall.tf.tmpl b/autogen/main/firewall.tf.tmpl index b050d0093e..991520acfb 100644 --- a/autogen/main/firewall.tf.tmpl +++ b/autogen/main/firewall.tf.tmpl @@ -112,7 +112,7 @@ resource "google_compute_firewall" "shadow_allow_pods" { allow { protocol = "sctp" } allow { protocol = "esp" } allow { protocol = "ah" } - + log_config { metadata = "INCLUDE_ALL_METADATA" } @@ -120,7 +120,7 @@ resource "google_compute_firewall" "shadow_allow_pods" { resource "google_compute_firewall" "shadow_allow_master" { count = var.add_shadow_firewall_rules ? 1 : 0 - + name = "gke-shadow-${substr(var.name, 0, min(25, length(var.name)))}-master" description = "Managed by terraform gke module: A shadow firewall rule to match the fireall allow master and woker nodes communication." project = local.network_project_id @@ -135,6 +135,7 @@ resource "google_compute_firewall" "shadow_allow_master" { protocol = "tcp" ports = ["10250", "443"] } + log_config { metadata = "INCLUDE_ALL_METADATA" } diff --git a/firewall.tf b/firewall.tf index e713fe2374..406389941d 100644 --- a/firewall.tf +++ b/firewall.tf @@ -108,7 +108,7 @@ resource "google_compute_firewall" "shadow_allow_pods" { allow { protocol = "sctp" } allow { protocol = "esp" } allow { protocol = "ah" } - + log_config { metadata = "INCLUDE_ALL_METADATA" } @@ -116,7 +116,7 @@ resource "google_compute_firewall" "shadow_allow_pods" { resource "google_compute_firewall" "shadow_allow_master" { count = var.add_shadow_firewall_rules ? 1 : 0 - + name = "gke-shadow-${substr(var.name, 0, min(25, length(var.name)))}-master" description = "Managed by terraform gke module: A shadow firewall rule to match the fireall allow master and woker nodes communication." project = local.network_project_id @@ -131,6 +131,7 @@ resource "google_compute_firewall" "shadow_allow_master" { protocol = "tcp" ports = ["10250", "443"] } + log_config { metadata = "INCLUDE_ALL_METADATA" } diff --git a/modules/beta-private-cluster-update-variant/firewall.tf b/modules/beta-private-cluster-update-variant/firewall.tf index 04a4103df9..d2d5749ada 100644 --- a/modules/beta-private-cluster-update-variant/firewall.tf +++ b/modules/beta-private-cluster-update-variant/firewall.tf @@ -102,7 +102,7 @@ resource "google_compute_firewall" "shadow_allow_pods" { allow { protocol = "sctp" } allow { protocol = "esp" } allow { protocol = "ah" } - + log_config { metadata = "INCLUDE_ALL_METADATA" } @@ -110,7 +110,7 @@ resource "google_compute_firewall" "shadow_allow_pods" { resource "google_compute_firewall" "shadow_allow_master" { count = var.add_shadow_firewall_rules ? 1 : 0 - + name = "gke-shadow-${substr(var.name, 0, min(25, length(var.name)))}-master" description = "Managed by terraform gke module: A shadow firewall rule to match the fireall allow master and woker nodes communication." project = local.network_project_id @@ -125,6 +125,7 @@ resource "google_compute_firewall" "shadow_allow_master" { protocol = "tcp" ports = ["10250", "443"] } + log_config { metadata = "INCLUDE_ALL_METADATA" } diff --git a/modules/beta-private-cluster/firewall.tf b/modules/beta-private-cluster/firewall.tf index 04a4103df9..d2d5749ada 100644 --- a/modules/beta-private-cluster/firewall.tf +++ b/modules/beta-private-cluster/firewall.tf @@ -102,7 +102,7 @@ resource "google_compute_firewall" "shadow_allow_pods" { allow { protocol = "sctp" } allow { protocol = "esp" } allow { protocol = "ah" } - + log_config { metadata = "INCLUDE_ALL_METADATA" } @@ -110,7 +110,7 @@ resource "google_compute_firewall" "shadow_allow_pods" { resource "google_compute_firewall" "shadow_allow_master" { count = var.add_shadow_firewall_rules ? 1 : 0 - + name = "gke-shadow-${substr(var.name, 0, min(25, length(var.name)))}-master" description = "Managed by terraform gke module: A shadow firewall rule to match the fireall allow master and woker nodes communication." project = local.network_project_id @@ -125,6 +125,7 @@ resource "google_compute_firewall" "shadow_allow_master" { protocol = "tcp" ports = ["10250", "443"] } + log_config { metadata = "INCLUDE_ALL_METADATA" } diff --git a/modules/beta-public-cluster-update-variant/firewall.tf b/modules/beta-public-cluster-update-variant/firewall.tf index e713fe2374..406389941d 100644 --- a/modules/beta-public-cluster-update-variant/firewall.tf +++ b/modules/beta-public-cluster-update-variant/firewall.tf @@ -108,7 +108,7 @@ resource "google_compute_firewall" "shadow_allow_pods" { allow { protocol = "sctp" } allow { protocol = "esp" } allow { protocol = "ah" } - + log_config { metadata = "INCLUDE_ALL_METADATA" } @@ -116,7 +116,7 @@ resource "google_compute_firewall" "shadow_allow_pods" { resource "google_compute_firewall" "shadow_allow_master" { count = var.add_shadow_firewall_rules ? 1 : 0 - + name = "gke-shadow-${substr(var.name, 0, min(25, length(var.name)))}-master" description = "Managed by terraform gke module: A shadow firewall rule to match the fireall allow master and woker nodes communication." project = local.network_project_id @@ -131,6 +131,7 @@ resource "google_compute_firewall" "shadow_allow_master" { protocol = "tcp" ports = ["10250", "443"] } + log_config { metadata = "INCLUDE_ALL_METADATA" } diff --git a/modules/beta-public-cluster/firewall.tf b/modules/beta-public-cluster/firewall.tf index e713fe2374..406389941d 100644 --- a/modules/beta-public-cluster/firewall.tf +++ b/modules/beta-public-cluster/firewall.tf @@ -108,7 +108,7 @@ resource "google_compute_firewall" "shadow_allow_pods" { allow { protocol = "sctp" } allow { protocol = "esp" } allow { protocol = "ah" } - + log_config { metadata = "INCLUDE_ALL_METADATA" } @@ -116,7 +116,7 @@ resource "google_compute_firewall" "shadow_allow_pods" { resource "google_compute_firewall" "shadow_allow_master" { count = var.add_shadow_firewall_rules ? 1 : 0 - + name = "gke-shadow-${substr(var.name, 0, min(25, length(var.name)))}-master" description = "Managed by terraform gke module: A shadow firewall rule to match the fireall allow master and woker nodes communication." project = local.network_project_id @@ -131,6 +131,7 @@ resource "google_compute_firewall" "shadow_allow_master" { protocol = "tcp" ports = ["10250", "443"] } + log_config { metadata = "INCLUDE_ALL_METADATA" } diff --git a/modules/private-cluster-update-variant/firewall.tf b/modules/private-cluster-update-variant/firewall.tf index 04a4103df9..d2d5749ada 100644 --- a/modules/private-cluster-update-variant/firewall.tf +++ b/modules/private-cluster-update-variant/firewall.tf @@ -102,7 +102,7 @@ resource "google_compute_firewall" "shadow_allow_pods" { allow { protocol = "sctp" } allow { protocol = "esp" } allow { protocol = "ah" } - + log_config { metadata = "INCLUDE_ALL_METADATA" } @@ -110,7 +110,7 @@ resource "google_compute_firewall" "shadow_allow_pods" { resource "google_compute_firewall" "shadow_allow_master" { count = var.add_shadow_firewall_rules ? 1 : 0 - + name = "gke-shadow-${substr(var.name, 0, min(25, length(var.name)))}-master" description = "Managed by terraform gke module: A shadow firewall rule to match the fireall allow master and woker nodes communication." project = local.network_project_id @@ -125,6 +125,7 @@ resource "google_compute_firewall" "shadow_allow_master" { protocol = "tcp" ports = ["10250", "443"] } + log_config { metadata = "INCLUDE_ALL_METADATA" } diff --git a/modules/private-cluster/firewall.tf b/modules/private-cluster/firewall.tf index 04a4103df9..d2d5749ada 100644 --- a/modules/private-cluster/firewall.tf +++ b/modules/private-cluster/firewall.tf @@ -102,7 +102,7 @@ resource "google_compute_firewall" "shadow_allow_pods" { allow { protocol = "sctp" } allow { protocol = "esp" } allow { protocol = "ah" } - + log_config { metadata = "INCLUDE_ALL_METADATA" } @@ -110,7 +110,7 @@ resource "google_compute_firewall" "shadow_allow_pods" { resource "google_compute_firewall" "shadow_allow_master" { count = var.add_shadow_firewall_rules ? 1 : 0 - + name = "gke-shadow-${substr(var.name, 0, min(25, length(var.name)))}-master" description = "Managed by terraform gke module: A shadow firewall rule to match the fireall allow master and woker nodes communication." project = local.network_project_id @@ -125,6 +125,7 @@ resource "google_compute_firewall" "shadow_allow_master" { protocol = "tcp" ports = ["10250", "443"] } + log_config { metadata = "INCLUDE_ALL_METADATA" }