Only configure cloudrun_config if enabled

Explicitly configuring cloudrun_config as disabled is a breaking change
which will recreate the cluster.

Author: aaron-lane

autogen/cluster_regional.tf

@@ -75,9 +75,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"}"]}"
     {% endif %}
   }
 

autogen/cluster_zonal.tf

@@ -76,9 +76,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"}"]}"
     {% endif %}
   }
 

autogen/main.tf

@@ -48,6 +48,11 @@ locals {
     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)}"
@@ -144,10 +149,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)}"
@@ -188,7 +189,7 @@ locals {
 {% if beta_cluster %}
   # 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