As per review: fixed indentation. Type casted to string whereever nec…

…essary. Removed check for calico in CustomizeDiff block. Signed-off-by: thatInfrastructureGuy <thatInfrastructureGuy@gmail.com>
hashicorp · Mar 4, 2019 · 6801100 · 6801100
1 parent c75a19f
commit 6801100
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/azurerm/data_source_kubernetes_cluster.go b/azurerm/data_source_kubernetes_cluster.go
@@ -618,7 +618,7 @@ func flattenKubernetesClusterDataSourceNetworkProfile(profile *containerservice.
 	values["network_plugin"] = profile.NetworkPlugin
 
 	if profile.NetworkPolicy != "" {
-		values["network_policy"] = profile.NetworkPolicy
+		values["network_policy"] = string(profile.NetworkPolicy)
 	}
 
 	if profile.ServiceCidr != nil {

diff --git a/azurerm/resource_arm_kubernetes_cluster.go b/azurerm/resource_arm_kubernetes_cluster.go
@@ -43,12 +43,6 @@ func resourceArmKubernetesCluster() *schema.Resource {
 					return nil
 				}
 
-				networkPolicy := profile["network_policy"].(string)
-
-				if networkPolicy != "calico" {
-					return nil
-				}
-
 				dockerBridgeCidr := profile["docker_bridge_cidr"].(string)
 				dnsServiceIP := profile["dns_service_ip"].(string)
 				serviceCidr := profile["service_cidr"].(string)
@@ -1069,7 +1063,7 @@ func flattenKubernetesClusterNetworkProfile(profile *containerservice.NetworkPro
 	values["network_plugin"] = profile.NetworkPlugin
 
 	if profile.NetworkPolicy != "" {
-		values["network_policy"] = profile.NetworkPolicy
+		values["network_policy"] = string(profile.NetworkPolicy)
 	}
 
 	if profile.ServiceCidr != nil {

diff --git a/azurerm/resource_arm_kubernetes_cluster_test.go b/azurerm/resource_arm_kubernetes_cluster_test.go
@@ -1224,7 +1224,7 @@ resource "azurerm_kubernetes_cluster" "test" {
 
   network_profile {
     network_plugin = "%s"
-		network_policy = "%s"
+    network_policy = "%s"
   }
 }
 `, rInt, location, rInt, rInt, rInt, rInt, rInt, clientId, clientSecret, networkPlugin, networkPolicy)
@@ -1301,8 +1301,8 @@ resource "azurerm_kubernetes_cluster" "test" {
   }
 
   network_profile {
-		network_plugin     = "%s"
-		network_policy     = "%s"
+    network_plugin     = "%s"
+    network_policy     = "%s"
     dns_service_ip     = "10.10.0.10"
     docker_bridge_cidr = "172.18.0.1/16"
     service_cidr       = "10.10.0.0/16"

diff --git a/website/docs/r/kubernetes_cluster.html.markdown b/website/docs/r/kubernetes_cluster.html.markdown
@@ -146,7 +146,7 @@ A `network_profile` block supports the following:
 
 -> **NOTE:** When `network_plugin` is set to `azure` - the `vnet_subnet_id` field in the `agent_pool_profile` block must be set.
 
-* `network_policy` - (Optional) Sets up network policy to be used with Azure CNI. [Network policy allows us to control the traffic flow between pods](https://docs.microsoft.com/en-us/azure/aks/use-network-policies). This field can only be set when `network_plugin` is set to `azure`. Currently only accepted value is `calico` which installs Calico daemonset. Changing this forces a new resource to be created.
+* `network_policy` - (Optional) Sets up network policy to be used with Azure CNI. [Network policy allows us to control the traffic flow between pods](https://docs.microsoft.com/en-us/azure/aks/use-network-policies). This field can only be set when `network_plugin` is set to `azure`. Currently the only accepted value is `calico` which installs Calico daemonset. Changing this forces a new resource to be created.
 
 * `dns_service_ip` - (Optional) IP address within the Kubernetes service address range that will be used by cluster service discovery (kube-dns). This is required when `network_plugin` is set to `azure`. Changing this forces a new resource to be created.