Skip to content

Commit 15f8e40

Browse files
committed
Fix permanent diff with generate and fmt
1 parent 7cb8a00 commit 15f8e40

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

autogen/cluster_regional.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ resource "google_container_cluster" "primary" {
107107
node_config {
108108
service_account = "${lookup(var.node_pools[0], "service_account", local.service_account)}"
109109
{% if beta_cluster %}
110+
110111
workload_metadata_config = "${local.cluster_node_metadata_config["${var.node_metadata == "UNSPECIFIED" ? "unspecified" : "specified"}"]}"
111112
{% endif %}
112113
}

autogen/cluster_zonal.tf

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ resource "google_container_cluster" "zonal_primary" {
3939
monitoring_service = "${var.monitoring_service}"
4040

4141
{% if beta_cluster %}
42-
enable_binary_authorization = "${var.enable_binary_authorization}"
43-
pod_security_policy_config = "${var.pod_security_policy_config}"
44-
{% endif %}
42+
enable_binary_authorization = "${var.enable_binary_authorization}"
43+
pod_security_policy_config = "${var.pod_security_policy_config}"
4544

45+
{% endif %}
4646
master_authorized_networks_config = ["${var.master_authorized_networks_config}"]
4747

4848
master_auth {
@@ -108,6 +108,7 @@ resource "google_container_cluster" "zonal_primary" {
108108
node_config {
109109
service_account = "${lookup(var.node_pools[0], "service_account", local.service_account)}"
110110
{% if beta_cluster %}
111+
111112
workload_metadata_config = "${local.cluster_node_metadata_config["${var.node_metadata == "UNSPECIFIED" ? "unspecified" : "specified"}"]}"
112113
{% endif %}
113114
}

autogen/dns.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ resource "kubernetes_config_map" "kube-dns-upstream-nameservers-and-stub-domains
9090
upstreamNameservers = <<EOF
9191
${jsonencode(var.upstream_nameservers)}
9292
EOF
93+
9394
stubDomains = <<EOF
9495
${jsonencode(var.stub_domains)}
9596
EOF

autogen/main.tf

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,8 @@ locals {
196196
cluster_kubernetes_dashboard_enabled = "${local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type] ? false : true}"
197197
{% if beta_cluster %}
198198
# BETA features
199-
cluster_istio_enabled = "${local.cluster_type_output_istio_enabled[local.cluster_type] ? false : true}"
200-
cluster_cloudrun_enabled = "${var.cloudrun}"
201-
199+
cluster_istio_enabled = "${local.cluster_type_output_istio_enabled[local.cluster_type] ? false : true}"
200+
cluster_cloudrun_enabled = "${var.cloudrun}"
202201
cluster_pod_security_policy_enabled = "${local.cluster_type_output_pod_security_policy_enabled[local.cluster_type] ? true : false}"
203202
# /BETA features
204203
{% endif %}

autogen/outputs.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ output "service_account" {
113113
value = "${local.service_account}"
114114
}
115115
{% if beta_cluster %}
116+
116117
output "istio_enabled" {
117118
description = "Whether Istio is enabled"
118119
value = "${local.cluster_istio_enabled}"

0 commit comments

Comments
 (0)