Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

azurerm_kubernetes_cluster - making linux_profile optional #1821

Merged
merged 10 commits into from Aug 30, 2018
Merged

azurerm_kubernetes_cluster - making linux_profile optional #1821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cc64845
:bug: (Linux profile of AKS.) Make linux_profile be optional.
metacpp Aug 24, 2018
db8ec61
:green_heart: (Import test of AKS.) Pass empty string to refactored f…
metacpp Aug 24, 2018
535c434
:green_heart: (Basic test of AKS.) Missing the linux_profile configur…
metacpp Aug 24, 2018
30280d6
:green_heart: (Basic test of AKS.) Remove useless basic test with lin…
metacpp Aug 24, 2018
966a0e6
:bug: (Linux profile of AKS.) Make linux_profile be computed.
metacpp Aug 24, 2018
c10542f
:bug: (AKS resource.) Return empty array if profile is nil.
metacpp Aug 25, 2018
2704c65
:white_check_mark: (Tests for AKS.) Add 2 tests for linuxProfile of AKS.
metacpp Aug 29, 2018
e091e40
:recycle: (Test code for AKS.) Refactor the test code for AKS.
metacpp Aug 29, 2018
e76e1c2
:rotating_light: (Import test for AKS.) Fix the go fmt error.
metacpp Aug 29, 2018
095ddf6
:green_heart: (Resource tests for AKS.) Fix the path issue for linux_…
metacpp Aug 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 25 additions & 0 deletions azurerm/import_arm_kubernetes_cluster_test.go
View file
Open in desktop
Expand Up @@ -32,3 +32,28 @@ func TestAccAzureRMKubernetesCluster_importBasic(t *testing.T) {
},
})
}

func TestAccAzureRMKubernetesCluster_importLinuxProfile(t *testing.T) {
resourceName := "azurerm_kubernetes_cluster.test"

ri := acctest.RandInt()
clientId := os.Getenv("ARM_CLIENT_ID")
clientSecret := os.Getenv("ARM_CLIENT_SECRET")
config := testAccAzureRMKubernetesCluster_linuxProfile(ri, clientId, clientSecret, testLocation())

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMKubernetesClusterDestroy,
Steps: []resource.TestStep{
{
Config: config,
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}
50 changes: 33 additions & 17 deletions azurerm/resource_arm_kubernetes_cluster.go
View file
Open in desktop
Expand Up @@ -135,7 +135,7 @@ func resourceArmKubernetesCluster() *schema.Resource {

"linux_profile": {
Type: schema.TypeList,
Required: true,
Optional: true,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Expand Down Expand Up @@ -403,7 +403,7 @@ func resourceArmKubernetesClusterCreate(d *schema.ResourceData, meta interface{}
AgentPoolProfiles: &agentProfiles,
DNSPrefix: &dnsPrefix,
KubernetesVersion: &kubernetesVersion,
LinuxProfile: &linuxProfile,
LinuxProfile: linuxProfile,
ServicePrincipalProfile: servicePrincipalProfile,
NetworkProfile: networkProfile,
},
Expand Down Expand Up @@ -532,33 +532,40 @@ func resourceArmKubernetesClusterDelete(d *schema.ResourceData, meta interface{}
return future.WaitForCompletionRef(ctx, kubernetesClustersClient.Client)
}

func flattenAzureRmKubernetesClusterLinuxProfile(input *containerservice.LinuxProfile) []interface{} {
func flattenAzureRmKubernetesClusterLinuxProfile(profile *containerservice.LinuxProfile) []interface{} {
if profile == nil {
return []interface{}{}
}

values := make(map[string]interface{})
sshKeys := make([]interface{}, 0)

if profile := input; profile != nil {
if username := profile.AdminUsername; username != nil {
values["admin_username"] = *username
}
if username := profile.AdminUsername; username != nil {
values["admin_username"] = *username
}

if ssh := profile.SSH; ssh != nil {
if keys := ssh.PublicKeys; keys != nil {
for _, sshKey := range *keys {
outputs := make(map[string]interface{}, 0)
if keyData := sshKey.KeyData; keyData != nil {
outputs["key_data"] = *keyData
}
sshKeys = append(sshKeys, outputs)
if ssh := profile.SSH; ssh != nil {
if keys := ssh.PublicKeys; keys != nil {
for _, sshKey := range *keys {
outputs := make(map[string]interface{}, 0)
if keyData := sshKey.KeyData; keyData != nil {
outputs["key_data"] = *keyData
}
sshKeys = append(sshKeys, outputs)
}
}
}

values["ssh_key"] = sshKeys

return []interface{}{values}
}

func flattenAzureRmKubernetesClusterAgentPoolProfiles(profiles *[]containerservice.ManagedClusterAgentPoolProfile, fqdn *string) []interface{} {
if profiles == nil {
return []interface{}{}
}

agentPoolProfiles := make([]interface{}, 0)

for _, profile := range *profiles {
Expand Down Expand Up @@ -650,6 +657,10 @@ func flattenAzureRmKubernetesClusterAccessProfile(profile *containerservice.Mana
}

func flattenAzureRmKubernetesClusterNetworkProfile(profile *containerservice.NetworkProfile) []interface{} {
if profile == nil {
return []interface{}{}
}

values := make(map[string]interface{})

values["network_plugin"] = profile.NetworkPlugin
Expand Down Expand Up @@ -690,8 +701,13 @@ func flattenKubernetesClusterKubeConfig(config kubernetes.KubeConfig) []interfac
return []interface{}{values}
}

func expandAzureRmKubernetesClusterLinuxProfile(d *schema.ResourceData) containerservice.LinuxProfile {
func expandAzureRmKubernetesClusterLinuxProfile(d *schema.ResourceData) *containerservice.LinuxProfile {
profiles := d.Get("linux_profile").([]interface{})

if len(profiles) == 0 {
return nil
}

config := profiles[0].(map[string]interface{})

adminUsername := config["admin_username"].(string)
Expand All @@ -714,7 +730,7 @@ func expandAzureRmKubernetesClusterLinuxProfile(d *schema.ResourceData) containe
},
}

return profile
return &profile
}

func expandAzureRmKubernetesClusterServicePrincipal(d *schema.ResourceData) *containerservice.ServicePrincipalProfile {
Expand Down
84 changes: 65 additions & 19 deletions azurerm/resource_arm_kubernetes_cluster_test.go
View file
Open in desktop
Expand Up @@ -98,6 +98,36 @@ func TestAccAzureRMKubernetesCluster_basic(t *testing.T) {
})
}

func TestAccAzureRMKubernetesCluster_linuxProfile(t *testing.T) {
resourceName := "azurerm_kubernetes_cluster.test"
ri := acctest.RandInt()
clientId := os.Getenv("ARM_CLIENT_ID")
clientSecret := os.Getenv("ARM_CLIENT_SECRET")
config := testAccAzureRMKubernetesCluster_linuxProfile(ri, clientId, clientSecret, testLocation())

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMKubernetesClusterDestroy,
Steps: []resource.TestStep{
{
Config: config,
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMKubernetesClusterExists(resourceName),
resource.TestCheckResourceAttrSet(resourceName, "kube_config.0.client_key"),
resource.TestCheckResourceAttrSet(resourceName, "kube_config.0.client_certificate"),
resource.TestCheckResourceAttrSet(resourceName, "kube_config.0.cluster_ca_certificate"),
resource.TestCheckResourceAttrSet(resourceName, "kube_config.0.host"),
resource.TestCheckResourceAttrSet(resourceName, "kube_config.0.username"),
resource.TestCheckResourceAttrSet(resourceName, "kube_config.0.password"),
resource.TestCheckResourceAttrSet(resourceName, "agent_pool_profile.0.max_pods"),
resource.TestCheckResourceAttrSet(resourceName, "linux_profile.0.admin_username"),
),
},
},
})
}

func TestAccAzureRMKubernetesCluster_addAgent(t *testing.T) {
resourceName := "azurerm_kubernetes_cluster.test"
ri := acctest.RandInt()
Expand Down Expand Up @@ -150,7 +180,7 @@ func TestAccAzureRMKubernetesCluster_upgradeConfig(t *testing.T) {
Config: upgradeConfig,
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMKubernetesClusterExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "kubernetes_version", "1.8.1"),
resource.TestCheckResourceAttr(resourceName, "kubernetes_version", "1.11.2"),
),
},
},
Expand Down Expand Up @@ -336,7 +366,34 @@ resource "azurerm_kubernetes_cluster" "test" {
location = "${azurerm_resource_group.test.location}"
resource_group_name = "${azurerm_resource_group.test.name}"
dns_prefix = "acctestaks%d"
kubernetes_version = "1.7.7"
kubernetes_version = "1.10.7"

agent_pool_profile {
name = "default"
count = "1"
vm_size = "Standard_DS2_v2"
}

service_principal {
client_id = "%s"
client_secret = "%s"
}
}
`, rInt, location, rInt, rInt, clientId, clientSecret)
metacpp marked this conversation as resolved.
Show resolved Hide resolved
}

func testAccAzureRMKubernetesCluster_linuxProfile(rInt int, clientId string, clientSecret string, location string) string {
return fmt.Sprintf(`
resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
location = "%s"
}

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"

linux_profile {
admin_username = "acctestuser%d"
Expand Down Expand Up @@ -372,15 +429,7 @@ resource "azurerm_kubernetes_cluster" "test" {
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 terraform@demo.tld"
}
}
kubernetes_version = "1.10.7"

agent_pool_profile {
name = "default"
Expand All @@ -393,7 +442,7 @@ resource "azurerm_kubernetes_cluster" "test" {
client_secret = "%s"
}
}
`, rInt, location, rInt, rInt, rInt, clientId, clientSecret)
`, rInt, location, rInt, rInt, clientId, clientSecret)
}

func testAccAzureRMKubernetesCluster_internalNetwork(rInt int, clientId string, clientSecret string, location string) string {
Expand Down Expand Up @@ -426,7 +475,6 @@ resource "azurerm_kubernetes_cluster" "test" {
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"
Expand Down Expand Up @@ -471,7 +519,7 @@ resource "azurerm_kubernetes_cluster" "test" {
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 {
Expand All @@ -489,7 +537,7 @@ resource "azurerm_kubernetes_cluster" "test" {
client_id = "%s"
client_secret = "%s"
}

addon_profile {
oms_agent {
enabled = true
Expand All @@ -512,7 +560,7 @@ resource "azurerm_kubernetes_cluster" "test" {
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 {
Expand Down Expand Up @@ -552,7 +600,7 @@ resource "azurerm_kubernetes_cluster" "test" {
location = "${azurerm_resource_group.test.location}"
resource_group_name = "${azurerm_resource_group.test.name}"
dns_prefix = "acctestaks%d"
kubernetes_version = "1.8.1"
kubernetes_version = "1.11.2"

linux_profile {
admin_username = "acctestuser%d"
Expand Down Expand Up @@ -606,7 +654,6 @@ resource "azurerm_kubernetes_cluster" "test" {
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"
Expand Down Expand Up @@ -665,7 +712,6 @@ resource "azurerm_kubernetes_cluster" "test" {
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"
Expand Down
10 changes: 1 addition & 9 deletions website/docs/r/kubernetes_cluster.html.markdown
View file
Open in desktop
Expand Up @@ -27,14 +27,6 @@ resource "azurerm_kubernetes_cluster" "test" {
resource_group_name = "${azurerm_resource_group.test.name}"
dns_prefix   = "acctestagent1"

linux_profile {
admin_username = "acctestuser1"

ssh_key {
key_data = "ssh-rsa ..."
}
}

agent_pool_profile {
name = "default"
count = 1
Expand Down Expand Up @@ -180,7 +172,7 @@ The following arguments are supported:

* `dns_prefix` - (Required) DNS prefix specified when creating the managed cluster.

* `linux_profile` - (Required) A Linux Profile block as documented below.
* `linux_profile` - (Optional) A Linux Profile block as documented below.

* `agent_pool_profile` - (Required) One or more Agent Pool Profile's block as documented below.

Expand Down