-
Notifications
You must be signed in to change notification settings - Fork 4.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
625b9f2
commit 66bb039
Showing
2 changed files
with
142 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -183,7 +183,7 @@ func TestAccAzureRMKubernetesCluster_advancedNetworkingKubenet(t *testing.T) { | |
ri := acctest.RandInt() | ||
clientId := os.Getenv("ARM_CLIENT_ID") | ||
clientSecret := os.Getenv("ARM_CLIENT_SECRET") | ||
config := testAccAzureRMKubernetesCluster_advancedNetworkingMinimum(ri, clientId, clientSecret, testLocation(), "kubenet") | ||
config := testAccAzureRMKubernetesCluster_advancedNetworking(ri, clientId, clientSecret, testLocation(), "kubenet") | ||
|
||
resource.Test(t, resource.TestCase{ | ||
PreCheck: func() { testAccPreCheck(t) }, | ||
|
@@ -229,7 +229,7 @@ func TestAccAzureRMKubernetesCluster_advancedNetworkingAzure(t *testing.T) { | |
ri := acctest.RandInt() | ||
clientId := os.Getenv("ARM_CLIENT_ID") | ||
clientSecret := os.Getenv("ARM_CLIENT_SECRET") | ||
config := testAccAzureRMKubernetesCluster_advancedNetworkingMinimum(ri, clientId, clientSecret, testLocation(), "azure") | ||
config := testAccAzureRMKubernetesCluster_advancedNetworking(ri, clientId, clientSecret, testLocation(), "azure") | ||
|
||
resource.Test(t, resource.TestCase{ | ||
PreCheck: func() { testAccPreCheck(t) }, | ||
|
@@ -433,7 +433,7 @@ resource "azurerm_kubernetes_cluster" "test" { | |
`, rInt, location, rInt, rInt, rInt, clientId, clientSecret) | ||
} | ||
|
||
func testAccAzureRMKubernetesCluster_advancedNetworking(rInt int, clientId string, clientSecret string, location string, networkProfile string) string { | ||
func testAccAzureRMKubernetesCluster_advancedNetworking(rInt int, clientId string, clientSecret string, location string, networkPlugin string) string { | ||
return fmt.Sprintf(` | ||
resource "azurerm_resource_group" "test" { | ||
name = "acctestRG-%d" | ||
|
@@ -485,28 +485,73 @@ resource "azurerm_kubernetes_cluster" "test" { | |
client_secret = "%s" | ||
} | ||
%s | ||
} | ||
`, rInt, location, rInt, rInt, rInt, rInt, rInt, clientId, clientSecret, networkProfile) | ||
} | ||
|
||
func testAccAzureRMKubernetesCluster_advancedNetworkingMinimum(rInt int, clientId string, clientSecret string, location string, networkPlugin string) string { | ||
return fmt.Sprintf(testAccAzureRMKubernetesCluster_advancedNetworking(rInt, clientId, clientSecret, location, ` | ||
network_profile { | ||
network_plugin = "%s" | ||
} | ||
`), networkPlugin) | ||
} | ||
`, rInt, location, rInt, rInt, rInt, rInt, rInt, clientId, clientSecret, networkPlugin) | ||
} | ||
|
||
func testAccAzureRMKubernetesCluster_advancedNetworkingComplete(rInt int, clientId string, clientSecret string, location string, networkPlugin string) string { | ||
return fmt.Sprintf(testAccAzureRMKubernetesCluster_advancedNetworking(rInt, clientId, clientSecret, location, ` | ||
return fmt.Sprintf(` | ||
resource "azurerm_resource_group" "test" { | ||
name = "acctestRG-%d" | ||
location = "%s" | ||
} | ||
resource "azurerm_virtual_network" "test" { | ||
name = "acctestvirtnet%d" | ||
address_space = ["10.1.0.0/16"] | ||
location = "${azurerm_resource_group.test.location}" | ||
resource_group_name = "${azurerm_resource_group.test.name}" | ||
tags { | ||
environment = "Testing" | ||
} | ||
} | ||
resource "azurerm_subnet" "test" { | ||
name = "acctestsubnet%d" | ||
resource_group_name = "${azurerm_resource_group.test.name}" | ||
virtual_network_name = "${azurerm_virtual_network.test.name}" | ||
address_prefix = "10.1.0.0/24" | ||
} | ||
resource "azurerm_kubernetes_cluster" "test" { | ||
name = "acctestaks%d" | ||
location = "${azurerm_resource_group.test.location}" | ||
resource_group_name = "${azurerm_resource_group.test.name}" | ||
dns_prefix = "acctestaks%d" | ||
kubernetes_version = "1.7.7" | ||
linux_profile { | ||
admin_username = "acctestuser%d" | ||
ssh_key { | ||
key_data = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCqaZoyiz1qbdOQ8xEf6uEu1cCwYowo5FHtsBhqLoDnnp7KUTEBN+L2NxRIfQ781rxV6Iq5jSav6b2Q8z5KiseOlvKA/RF2wqU0UPYqQviQhLmW6THTpmrv/YkUCuzxDpsH7DUDhZcwySLKVVe0Qm3+5N2Ta6UYH3lsDf9R9wTP2K/+vAnflKebuypNlmocIvakFWoZda18FOmsOoIVXQ8HWFNCuw9ZCunMSN62QGamCe3dL5cXlkgHYv7ekJE15IA9aOJcM7e90oeTqo+7HTcWfdu0qQqPWY5ujyMw/llas8tsXY85LFqRnr3gJ02bAscjc477+X+j/gkpFoN1QEmt [email protected]" | ||
} | ||
} | ||
agent_pool_profile { | ||
name = "default" | ||
count = "2" | ||
vm_size = "Standard_DS2_v2" | ||
vnet_subnet_id = "${azurerm_subnet.test.id}" | ||
} | ||
service_principal { | ||
client_id = "%s" | ||
client_secret = "%s" | ||
} | ||
network_profile { | ||
network_plugin = "%s" | ||
network_plugin = "%s" | ||
dns_service_ip = "10.10.0.10" | ||
docker_bridge_cidr = "172.18.0.1/16" | ||
service_cidr = "10.10.0.0/16" | ||
} | ||
`), networkPlugin) | ||
} | ||
`, rInt, location, rInt, rInt, rInt, rInt, rInt, clientId, clientSecret, networkPlugin) | ||
} | ||
|
||
func testCheckAzureRMKubernetesClusterExists(name string) resource.TestCheckFunc { | ||
|