From 9a40468210a5dd75a9f3dcc0fe2754f34aaee661 Mon Sep 17 00:00:00 2001
From: Aaron Lane <aarondrewlane@gmail.com>
Date: Tue, 2 Jul 2019 17:40:38 -0400
Subject: [PATCH] Regenerate modules

---
 cluster_regional.tf                           |  6 +----
 cluster_zonal.tf                              |  6 +----
 main.tf                                       | 19 ++++++++++++++
 .../beta-private-cluster/cluster_regional.tf  | 10 ++-----
 modules/beta-private-cluster/cluster_zonal.tf | 10 ++-----
 modules/beta-private-cluster/main.tf          | 26 ++++++++++++++-----
 .../beta-public-cluster/cluster_regional.tf   | 10 ++-----
 modules/beta-public-cluster/cluster_zonal.tf  | 10 ++-----
 modules/beta-public-cluster/main.tf           | 26 ++++++++++++++-----
 modules/private-cluster/cluster_regional.tf   |  6 +----
 modules/private-cluster/cluster_zonal.tf      |  6 +----
 modules/private-cluster/main.tf               | 19 ++++++++++++++
 12 files changed, 90 insertions(+), 64 deletions(-)

diff --git a/cluster_regional.tf b/cluster_regional.tf
index 3f6394ba4d..9194fbba17 100644
--- a/cluster_regional.tf
+++ b/cluster_regional.tf
@@ -30,11 +30,7 @@ resource "google_container_cluster" "primary" {
   node_locations    = ["${coalescelist(compact(var.zones), sort(random_shuffle.available_zones.result))}"]
   cluster_ipv4_cidr = "${var.cluster_ipv4_cidr}"
   network           = "${replace(data.google_compute_network.gke_network.self_link, "https://www.googleapis.com/compute/v1/", "")}"
-
-  network_policy {
-    enabled  = "${var.network_policy}"
-    provider = "${var.network_policy_provider}"
-  }
+  network_policy    = "${local.cluster_network_policy["${var.network_policy ? "enabled" : "disabled"}"]}"
 
   subnetwork         = "${replace(data.google_compute_subnetwork.gke_subnetwork.self_link, "https://www.googleapis.com/compute/v1/", "")}"
   min_master_version = "${local.kubernetes_version_regional}"
diff --git a/cluster_zonal.tf b/cluster_zonal.tf
index a7ed1d07e1..8b4eb7cc5a 100644
--- a/cluster_zonal.tf
+++ b/cluster_zonal.tf
@@ -30,11 +30,7 @@ resource "google_container_cluster" "zonal_primary" {
   node_locations    = ["${slice(var.zones,1,length(var.zones))}"]
   cluster_ipv4_cidr = "${var.cluster_ipv4_cidr}"
   network           = "${replace(data.google_compute_network.gke_network.self_link, "https://www.googleapis.com/compute/v1/", "")}"
-
-  network_policy {
-    enabled  = "${var.network_policy}"
-    provider = "${var.network_policy_provider}"
-  }
+  network_policy    = "${local.cluster_network_policy["${var.network_policy ? "enabled" : "disabled"}"]}"
 
   subnetwork         = "${replace(data.google_compute_subnetwork.gke_subnetwork.self_link, "https://www.googleapis.com/compute/v1/", "")}"
   min_master_version = "${local.kubernetes_version_zonal}"
diff --git a/main.tf b/main.tf
index 0b88544f21..0537749534 100644
--- a/main.tf
+++ b/main.tf
@@ -40,6 +40,25 @@ locals {
 
   cluster_type = "${var.regional ? "regional" : "zonal"}"
 
+  cluster_network_policy = {
+    enabled = [{
+      enabled  = "true"
+      provider = "${var.network_policy_provider}"
+    }]
+
+    disabled = [{
+      enabled = "false"
+    }]
+  }
+
+  cluster_cloudrun_config = {
+    enabled = [{
+      disabled = "false"
+    }]
+
+    disabled = []
+  }
+
   cluster_type_output_name = {
     regional = "${element(concat(google_container_cluster.primary.*.name, list("")), 0)}"
     zonal    = "${element(concat(google_container_cluster.zonal_primary.*.name, list("")), 0)}"
diff --git a/modules/beta-private-cluster/cluster_regional.tf b/modules/beta-private-cluster/cluster_regional.tf
index 12552bca33..9e95d2e35b 100644
--- a/modules/beta-private-cluster/cluster_regional.tf
+++ b/modules/beta-private-cluster/cluster_regional.tf
@@ -30,11 +30,7 @@ resource "google_container_cluster" "primary" {
   node_locations    = ["${coalescelist(compact(var.zones), sort(random_shuffle.available_zones.result))}"]
   cluster_ipv4_cidr = "${var.cluster_ipv4_cidr}"
   network           = "${replace(data.google_compute_network.gke_network.self_link, "https://www.googleapis.com/compute/v1/", "")}"
-
-  network_policy {
-    enabled  = "${var.network_policy}"
-    provider = "${var.network_policy_provider}"
-  }
+  network_policy    = "${local.cluster_network_policy["${var.network_policy ? "enabled" : "disabled"}"]}"
 
   subnetwork         = "${replace(data.google_compute_subnetwork.gke_subnetwork.self_link, "https://www.googleapis.com/compute/v1/", "")}"
   min_master_version = "${local.kubernetes_version_regional}"
@@ -76,9 +72,7 @@ resource "google_container_cluster" "primary" {
       disabled = "${var.istio ? 0 : 1}"
     }
 
-    cloudrun_config {
-      disabled = "${var.cloudrun ? 0 : 1}"
-    }
+    cloudrun_config = "${local.cluster_cloudrun_config["${var.cloudrun ? "enabled" : "disabled"}"]}"
   }
 
   ip_allocation_policy {
diff --git a/modules/beta-private-cluster/cluster_zonal.tf b/modules/beta-private-cluster/cluster_zonal.tf
index a1d5edf744..d867b915b6 100644
--- a/modules/beta-private-cluster/cluster_zonal.tf
+++ b/modules/beta-private-cluster/cluster_zonal.tf
@@ -30,11 +30,7 @@ resource "google_container_cluster" "zonal_primary" {
   node_locations    = ["${slice(var.zones,1,length(var.zones))}"]
   cluster_ipv4_cidr = "${var.cluster_ipv4_cidr}"
   network           = "${replace(data.google_compute_network.gke_network.self_link, "https://www.googleapis.com/compute/v1/", "")}"
-
-  network_policy {
-    enabled  = "${var.network_policy}"
-    provider = "${var.network_policy_provider}"
-  }
+  network_policy    = "${local.cluster_network_policy["${var.network_policy ? "enabled" : "disabled"}"]}"
 
   subnetwork         = "${replace(data.google_compute_subnetwork.gke_subnetwork.self_link, "https://www.googleapis.com/compute/v1/", "")}"
   min_master_version = "${local.kubernetes_version_zonal}"
@@ -77,9 +73,7 @@ resource "google_container_cluster" "zonal_primary" {
       disabled = "${var.istio ? 0 : 1}"
     }
 
-    cloudrun_config {
-      disabled = "${var.cloudrun ? 0 : 1}"
-    }
+    cloudrun_config = "${local.cluster_cloudrun_config["${var.cloudrun ? "enabled" : "disabled"}"]}"
   }
 
   ip_allocation_policy {
diff --git a/modules/beta-private-cluster/main.tf b/modules/beta-private-cluster/main.tf
index 75d26fd69b..564136315b 100644
--- a/modules/beta-private-cluster/main.tf
+++ b/modules/beta-private-cluster/main.tf
@@ -40,6 +40,25 @@ locals {
 
   cluster_type = "${var.regional ? "regional" : "zonal"}"
 
+  cluster_network_policy = {
+    enabled = [{
+      enabled  = "true"
+      provider = "${var.network_policy_provider}"
+    }]
+
+    disabled = [{
+      enabled = "false"
+    }]
+  }
+
+  cluster_cloudrun_config = {
+    enabled = [{
+      disabled = "false"
+    }]
+
+    disabled = []
+  }
+
   cluster_type_output_name = {
     regional = "${element(concat(google_container_cluster.primary.*.name, list("")), 0)}"
     zonal    = "${element(concat(google_container_cluster.zonal_primary.*.name, list("")), 0)}"
@@ -128,11 +147,6 @@ locals {
     zonal    = "${element(concat(google_container_cluster.zonal_primary.*.addons_config.0.istio_config.0.disabled, list("")), 0)}"
   }
 
-  cluster_type_output_cloudrun_enabled = {
-    regional = "${element(concat(google_container_cluster.primary.*.addons_config.0.cloudrun_config.0.disabled, list("")), 0)}"
-    zonal    = "${element(concat(google_container_cluster.zonal_primary.*.addons_config.0.cloudrun_config.0.disabled, list("")), 0)}"
-  }
-
   cluster_type_output_pod_security_policy_enabled = {
     regional = "${element(concat(google_container_cluster.primary.*.pod_security_policy_config.0.enabled, list("")), 0)}"
     zonal    = "${element(concat(google_container_cluster.zonal_primary.*.pod_security_policy_config.0.enabled, list("")), 0)}"
@@ -170,7 +184,7 @@ locals {
   cluster_kubernetes_dashboard_enabled       = "${local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type] ? false : true}"
   # BETA features
   cluster_istio_enabled    = "${local.cluster_type_output_istio_enabled[local.cluster_type] ? false : true}"
-  cluster_cloudrun_enabled = "${local.cluster_type_output_cloudrun_enabled[local.cluster_type] ? false : true}"
+  cluster_cloudrun_enabled = "${var.cloudrun}"
   cluster_pod_security_policy_enabled = "${local.cluster_type_output_pod_security_policy_enabled[local.cluster_type] ? true : false}"
 
   # /BETA features
diff --git a/modules/beta-public-cluster/cluster_regional.tf b/modules/beta-public-cluster/cluster_regional.tf
index 56fde5a2da..c745074eff 100644
--- a/modules/beta-public-cluster/cluster_regional.tf
+++ b/modules/beta-public-cluster/cluster_regional.tf
@@ -30,11 +30,7 @@ resource "google_container_cluster" "primary" {
   node_locations    = ["${coalescelist(compact(var.zones), sort(random_shuffle.available_zones.result))}"]
   cluster_ipv4_cidr = "${var.cluster_ipv4_cidr}"
   network           = "${replace(data.google_compute_network.gke_network.self_link, "https://www.googleapis.com/compute/v1/", "")}"
-
-  network_policy {
-    enabled  = "${var.network_policy}"
-    provider = "${var.network_policy_provider}"
-  }
+  network_policy    = "${local.cluster_network_policy["${var.network_policy ? "enabled" : "disabled"}"]}"
 
   subnetwork         = "${replace(data.google_compute_subnetwork.gke_subnetwork.self_link, "https://www.googleapis.com/compute/v1/", "")}"
   min_master_version = "${local.kubernetes_version_regional}"
@@ -76,9 +72,7 @@ resource "google_container_cluster" "primary" {
       disabled = "${var.istio ? 0 : 1}"
     }
 
-    cloudrun_config {
-      disabled = "${var.cloudrun ? 0 : 1}"
-    }
+    cloudrun_config = "${local.cluster_cloudrun_config["${var.cloudrun ? "enabled" : "disabled"}"]}"
   }
 
   ip_allocation_policy {
diff --git a/modules/beta-public-cluster/cluster_zonal.tf b/modules/beta-public-cluster/cluster_zonal.tf
index a7331edd92..d2ed15413c 100644
--- a/modules/beta-public-cluster/cluster_zonal.tf
+++ b/modules/beta-public-cluster/cluster_zonal.tf
@@ -30,11 +30,7 @@ resource "google_container_cluster" "zonal_primary" {
   node_locations    = ["${slice(var.zones,1,length(var.zones))}"]
   cluster_ipv4_cidr = "${var.cluster_ipv4_cidr}"
   network           = "${replace(data.google_compute_network.gke_network.self_link, "https://www.googleapis.com/compute/v1/", "")}"
-
-  network_policy {
-    enabled  = "${var.network_policy}"
-    provider = "${var.network_policy_provider}"
-  }
+  network_policy    = "${local.cluster_network_policy["${var.network_policy ? "enabled" : "disabled"}"]}"
 
   subnetwork         = "${replace(data.google_compute_subnetwork.gke_subnetwork.self_link, "https://www.googleapis.com/compute/v1/", "")}"
   min_master_version = "${local.kubernetes_version_zonal}"
@@ -77,9 +73,7 @@ resource "google_container_cluster" "zonal_primary" {
       disabled = "${var.istio ? 0 : 1}"
     }
 
-    cloudrun_config {
-      disabled = "${var.cloudrun ? 0 : 1}"
-    }
+    cloudrun_config = "${local.cluster_cloudrun_config["${var.cloudrun ? "enabled" : "disabled"}"]}"
   }
 
   ip_allocation_policy {
diff --git a/modules/beta-public-cluster/main.tf b/modules/beta-public-cluster/main.tf
index 4bfdf29952..712b943b67 100644
--- a/modules/beta-public-cluster/main.tf
+++ b/modules/beta-public-cluster/main.tf
@@ -40,6 +40,25 @@ locals {
 
   cluster_type = "${var.regional ? "regional" : "zonal"}"
 
+  cluster_network_policy = {
+    enabled = [{
+      enabled  = "true"
+      provider = "${var.network_policy_provider}"
+    }]
+
+    disabled = [{
+      enabled = "false"
+    }]
+  }
+
+  cluster_cloudrun_config = {
+    enabled = [{
+      disabled = "false"
+    }]
+
+    disabled = []
+  }
+
   cluster_type_output_name = {
     regional = "${element(concat(google_container_cluster.primary.*.name, list("")), 0)}"
     zonal    = "${element(concat(google_container_cluster.zonal_primary.*.name, list("")), 0)}"
@@ -119,11 +138,6 @@ locals {
     zonal    = "${element(concat(google_container_cluster.zonal_primary.*.addons_config.0.istio_config.0.disabled, list("")), 0)}"
   }
 
-  cluster_type_output_cloudrun_enabled = {
-    regional = "${element(concat(google_container_cluster.primary.*.addons_config.0.cloudrun_config.0.disabled, list("")), 0)}"
-    zonal    = "${element(concat(google_container_cluster.zonal_primary.*.addons_config.0.cloudrun_config.0.disabled, list("")), 0)}"
-  }
-
   cluster_type_output_pod_security_policy_enabled = {
     regional = "${element(concat(google_container_cluster.primary.*.pod_security_policy_config.0.enabled, list("")), 0)}"
     zonal    = "${element(concat(google_container_cluster.zonal_primary.*.pod_security_policy_config.0.enabled, list("")), 0)}"
@@ -161,7 +175,7 @@ locals {
   cluster_kubernetes_dashboard_enabled       = "${local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type] ? false : true}"
   # BETA features
   cluster_istio_enabled    = "${local.cluster_type_output_istio_enabled[local.cluster_type] ? false : true}"
-  cluster_cloudrun_enabled = "${local.cluster_type_output_cloudrun_enabled[local.cluster_type] ? false : true}"
+  cluster_cloudrun_enabled = "${var.cloudrun}"
   cluster_pod_security_policy_enabled = "${local.cluster_type_output_pod_security_policy_enabled[local.cluster_type] ? true : false}"
 
   # /BETA features
diff --git a/modules/private-cluster/cluster_regional.tf b/modules/private-cluster/cluster_regional.tf
index d52ca5e746..141c9b9445 100644
--- a/modules/private-cluster/cluster_regional.tf
+++ b/modules/private-cluster/cluster_regional.tf
@@ -30,11 +30,7 @@ resource "google_container_cluster" "primary" {
   node_locations    = ["${coalescelist(compact(var.zones), sort(random_shuffle.available_zones.result))}"]
   cluster_ipv4_cidr = "${var.cluster_ipv4_cidr}"
   network           = "${replace(data.google_compute_network.gke_network.self_link, "https://www.googleapis.com/compute/v1/", "")}"
-
-  network_policy {
-    enabled  = "${var.network_policy}"
-    provider = "${var.network_policy_provider}"
-  }
+  network_policy    = "${local.cluster_network_policy["${var.network_policy ? "enabled" : "disabled"}"]}"
 
   subnetwork         = "${replace(data.google_compute_subnetwork.gke_subnetwork.self_link, "https://www.googleapis.com/compute/v1/", "")}"
   min_master_version = "${local.kubernetes_version_regional}"
diff --git a/modules/private-cluster/cluster_zonal.tf b/modules/private-cluster/cluster_zonal.tf
index 4fe7d8f24e..b410c08048 100644
--- a/modules/private-cluster/cluster_zonal.tf
+++ b/modules/private-cluster/cluster_zonal.tf
@@ -30,11 +30,7 @@ resource "google_container_cluster" "zonal_primary" {
   node_locations    = ["${slice(var.zones,1,length(var.zones))}"]
   cluster_ipv4_cidr = "${var.cluster_ipv4_cidr}"
   network           = "${replace(data.google_compute_network.gke_network.self_link, "https://www.googleapis.com/compute/v1/", "")}"
-
-  network_policy {
-    enabled  = "${var.network_policy}"
-    provider = "${var.network_policy_provider}"
-  }
+  network_policy    = "${local.cluster_network_policy["${var.network_policy ? "enabled" : "disabled"}"]}"
 
   subnetwork         = "${replace(data.google_compute_subnetwork.gke_subnetwork.self_link, "https://www.googleapis.com/compute/v1/", "")}"
   min_master_version = "${local.kubernetes_version_zonal}"
diff --git a/modules/private-cluster/main.tf b/modules/private-cluster/main.tf
index 99dddeea37..826d5a2a0c 100644
--- a/modules/private-cluster/main.tf
+++ b/modules/private-cluster/main.tf
@@ -40,6 +40,25 @@ locals {
 
   cluster_type = "${var.regional ? "regional" : "zonal"}"
 
+  cluster_network_policy = {
+    enabled = [{
+      enabled  = "true"
+      provider = "${var.network_policy_provider}"
+    }]
+
+    disabled = [{
+      enabled = "false"
+    }]
+  }
+
+  cluster_cloudrun_config = {
+    enabled = [{
+      disabled = "false"
+    }]
+
+    disabled = []
+  }
+
   cluster_type_output_name = {
     regional = "${element(concat(google_container_cluster.primary.*.name, list("")), 0)}"
     zonal    = "${element(concat(google_container_cluster.zonal_primary.*.name, list("")), 0)}"