-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
155 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,155 @@ | ||
From a05430ba707f64aef6f67d8db672e465a7741570 Mon Sep 17 00:00:00 2001 | ||
From: IIBenII <benjamin.berriot@gmail.com> | ||
Date: Wed, 4 Jan 2023 16:08:05 +0100 | ||
Subject: [PATCH] Remove whitespace | ||
|
||
--- | ||
autogen/main/main.tf.tmpl | 1 - | ||
main.tf | 3 +-- | ||
modules/beta-autopilot-private-cluster/main.tf | 1 - | ||
modules/beta-autopilot-public-cluster/main.tf | 1 - | ||
modules/beta-private-cluster-update-variant/main.tf | 3 +-- | ||
modules/beta-private-cluster/main.tf | 3 +-- | ||
modules/beta-public-cluster-update-variant/main.tf | 3 +-- | ||
modules/beta-public-cluster/main.tf | 3 +-- | ||
modules/private-cluster-update-variant/main.tf | 3 +-- | ||
modules/private-cluster/main.tf | 3 +-- | ||
10 files changed, 7 insertions(+), 17 deletions(-) | ||
|
||
diff --git a/autogen/main/main.tf.tmpl b/autogen/main/main.tf.tmpl | ||
index be50ce8b..002e7633 100644 | ||
--- a/autogen/main/main.tf.tmpl | ||
+++ b/autogen/main/main.tf.tmpl | ||
@@ -118,7 +118,6 @@ locals { | ||
cluster_cloudrun_enabled = var.cloudrun | ||
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }] | ||
{% endif %} | ||
- | ||
{% if autopilot_cluster != true %} | ||
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus | ||
{% endif %} | ||
diff --git a/main.tf b/main.tf | ||
index 0a6c8a3d..41a6e1c3 100644 | ||
--- a/main.tf | ||
+++ b/main.tf | ||
@@ -84,8 +84,7 @@ locals { | ||
provider = null | ||
}] | ||
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }] | ||
- | ||
- logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus | ||
+ logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus | ||
|
||
cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{ | ||
security_group = var.authenticator_security_group | ||
diff --git a/modules/beta-autopilot-private-cluster/main.tf b/modules/beta-autopilot-private-cluster/main.tf | ||
index 68da9939..8e196422 100644 | ||
--- a/modules/beta-autopilot-private-cluster/main.tf | ||
+++ b/modules/beta-autopilot-private-cluster/main.tf | ||
@@ -64,7 +64,6 @@ locals { | ||
pod_all_ip_ranges = var.add_cluster_firewall_rules ? [local.cluster_alias_ranges_cidr[var.ip_range_pods]] : [] | ||
|
||
|
||
- | ||
cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{ | ||
security_group = var.authenticator_security_group | ||
}] | ||
diff --git a/modules/beta-autopilot-public-cluster/main.tf b/modules/beta-autopilot-public-cluster/main.tf | ||
index c4984c23..6ec8dbcd 100644 | ||
--- a/modules/beta-autopilot-public-cluster/main.tf | ||
+++ b/modules/beta-autopilot-public-cluster/main.tf | ||
@@ -64,7 +64,6 @@ locals { | ||
pod_all_ip_ranges = var.add_cluster_firewall_rules ? [local.cluster_alias_ranges_cidr[var.ip_range_pods]] : [] | ||
|
||
|
||
- | ||
cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{ | ||
security_group = var.authenticator_security_group | ||
}] | ||
diff --git a/modules/beta-private-cluster-update-variant/main.tf b/modules/beta-private-cluster-update-variant/main.tf | ||
index 60b38a56..c7ad1f3c 100644 | ||
--- a/modules/beta-private-cluster-update-variant/main.tf | ||
+++ b/modules/beta-private-cluster-update-variant/main.tf | ||
@@ -98,8 +98,7 @@ locals { | ||
] : [] | ||
cluster_cloudrun_enabled = var.cloudrun | ||
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }] | ||
- | ||
- logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus | ||
+ logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus | ||
|
||
cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{ | ||
security_group = var.authenticator_security_group | ||
diff --git a/modules/beta-private-cluster/main.tf b/modules/beta-private-cluster/main.tf | ||
index 60b38a56..c7ad1f3c 100644 | ||
--- a/modules/beta-private-cluster/main.tf | ||
+++ b/modules/beta-private-cluster/main.tf | ||
@@ -98,8 +98,7 @@ locals { | ||
] : [] | ||
cluster_cloudrun_enabled = var.cloudrun | ||
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }] | ||
- | ||
- logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus | ||
+ logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus | ||
|
||
cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{ | ||
security_group = var.authenticator_security_group | ||
diff --git a/modules/beta-public-cluster-update-variant/main.tf b/modules/beta-public-cluster-update-variant/main.tf | ||
index ee21a074..02195dd0 100644 | ||
--- a/modules/beta-public-cluster-update-variant/main.tf | ||
+++ b/modules/beta-public-cluster-update-variant/main.tf | ||
@@ -98,8 +98,7 @@ locals { | ||
] : [] | ||
cluster_cloudrun_enabled = var.cloudrun | ||
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }] | ||
- | ||
- logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus | ||
+ logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus | ||
|
||
cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{ | ||
security_group = var.authenticator_security_group | ||
diff --git a/modules/beta-public-cluster/main.tf b/modules/beta-public-cluster/main.tf | ||
index ee21a074..02195dd0 100644 | ||
--- a/modules/beta-public-cluster/main.tf | ||
+++ b/modules/beta-public-cluster/main.tf | ||
@@ -98,8 +98,7 @@ locals { | ||
] : [] | ||
cluster_cloudrun_enabled = var.cloudrun | ||
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }] | ||
- | ||
- logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus | ||
+ logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus | ||
|
||
cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{ | ||
security_group = var.authenticator_security_group | ||
diff --git a/modules/private-cluster-update-variant/main.tf b/modules/private-cluster-update-variant/main.tf | ||
index 7d5446f9..4f9a4f7a 100644 | ||
--- a/modules/private-cluster-update-variant/main.tf | ||
+++ b/modules/private-cluster-update-variant/main.tf | ||
@@ -84,8 +84,7 @@ locals { | ||
provider = null | ||
}] | ||
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }] | ||
- | ||
- logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus | ||
+ logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus | ||
|
||
cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{ | ||
security_group = var.authenticator_security_group | ||
diff --git a/modules/private-cluster/main.tf b/modules/private-cluster/main.tf | ||
index 7d5446f9..4f9a4f7a 100644 | ||
--- a/modules/private-cluster/main.tf | ||
+++ b/modules/private-cluster/main.tf | ||
@@ -84,8 +84,7 @@ locals { | ||
provider = null | ||
}] | ||
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }] | ||
- | ||
- logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus | ||
+ logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus | ||
|
||
cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{ | ||
security_group = var.authenticator_security_group | ||
-- | ||
2.39.0 | ||
|