Only configure network policy provider if enabled

Configuring the network policy provider when disabled is invalid.

Author: aaron-lane

autogen/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}"

autogen/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}"

autogen/main.tf

@@ -40,6 +40,14 @@ locals {
 
   cluster_type = "${var.regional ? "regional" : "zonal"}"
 
+  cluster_network_policy = {
+    enabled = [{
+      enabled  = "true"
+      provider = "${var.network_policy_provider}"
+    }]
+    disabled = [{enabled = "false"}]
+  }
+
   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)}"