Skip to content

Commit

Permalink
Fix PR comments
Browse files Browse the repository at this point in the history
  • Loading branch information
titilambert committed Jul 8, 2019
1 parent 1c07da3 commit f8338ac
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 19 deletions.
4 changes: 1 addition & 3 deletions azurerm/resource_arm_kubernetes_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,6 @@ func resourceArmKubernetesClusterCreateUpdate(d *schema.ResourceData, meta inter
if err != nil {
return err
}
// TODO add err ?
windowsProfile := expandKubernetesClusterWindowsProfile(d)
servicePrincipalProfile := expandAzureRmKubernetesClusterServicePrincipal(d)
networkProfile := expandKubernetesClusterNetworkProfile(d)
Expand Down Expand Up @@ -1172,8 +1171,7 @@ func flattenKubernetesClusterWindowsProfile(profile *containerservice.ManagedClu

// admin password isn't returned, so let's look it up
if v, ok := d.GetOk("windows_profile.0.admin_password"); ok {
password := v.(string)
values["admin_password"] = password
values["admin_password"] := v.(string)
}

return []interface{}{values}
Expand Down
32 changes: 16 additions & 16 deletions azurerm/resource_arm_kubernetes_cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -926,23 +926,23 @@ resource "azurerm_kubernetes_cluster" "test" {
}
agent_pool_profile {
name = "linux"
type = "VirtualMachineScaleSets"
count = "1"
vm_size = "Standard_DS2_v2"
max_pods = 30
os_type = "Linux"
os_disk_size_gb = "30"
name = "linux"
type = "VirtualMachineScaleSets"
count = "1"
vm_size = "Standard_DS2_v2"
max_pods = 30
os_type = "Linux"
os_disk_size_gb = "30"
}
agent_pool_profile {
name = "win"
type = "VirtualMachineScaleSets"
count = "1"
vm_size = "Standard_DS3_v2"
max_pods = 30
os_type = "Windows"
os_disk_size_gb = "30"
name = "win"
type = "VirtualMachineScaleSets"
count = "1"
vm_size = "Standard_DS3_v2"
max_pods = 30
os_type = "Windows"
os_disk_size_gb = "30"
}
service_principal {
Expand All @@ -951,8 +951,8 @@ resource "azurerm_kubernetes_cluster" "test" {
}
network_profile {
network_plugin = "azure"
network_policy = "azure"
network_plugin = "azure"
network_policy = "azure"
dns_service_ip = "10.10.0.10"
docker_bridge_cidr = "172.18.0.1/16"
service_cidr = "10.10.0.0/16"
Expand Down

0 comments on commit f8338ac

Please sign in to comment.