support for azs

spectrocloud · Jan 18, 2021 · 0f2dcfe · 0f2dcfe
1 parent b475aa4
commit 0f2dcfe
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/examples/e2e/azure/resource_cluster.tf b/examples/e2e/azure/resource_cluster.tf
@@ -37,6 +37,7 @@ resource "spectrocloud_cluster_azure" "cluster" {
     name                    = "master-pool"
     count                   = 1
     instance_type           = "Standard_D2_v3"
+    azs                     = []
     disk {
       size_gb = 65
       type    = "Standard_LRS"
@@ -47,6 +48,7 @@ resource "spectrocloud_cluster_azure" "cluster" {
     name          = "worker-basic"
     count         = 1
     instance_type = "Standard_D2_v3"
+    azs           = []
   }
 
 }
diff --git a/examples/resources/spectrocloud_cluster_azure/resource.tf b/examples/resources/spectrocloud_cluster_azure/resource.tf
@@ -46,6 +46,7 @@ resource "spectrocloud_cluster_azure" "cluster" {
     name                    = "master-pool"
     count                   = 1
     instance_type           = "Standard_D2_v3"
+    azs                     = []
     disk {
       size_gb = 65
       type    = "Standard_LRS"
@@ -56,6 +57,7 @@ resource "spectrocloud_cluster_azure" "cluster" {
     name          = "worker-basic"
     count         = 1
     instance_type = "Standard_D2_v3"
+    azs           = []
   }
 
 }
diff --git a/spectrocloud/cluster_common.go b/spectrocloud/cluster_common.go
@@ -119,6 +119,7 @@ func resourceMachinePoolAzureHash(v interface{}) int {
 	buf.WriteString(fmt.Sprintf("%s-", m["name"].(string)))
 	buf.WriteString(fmt.Sprintf("%d-", m["count"].(int)))
 	buf.WriteString(fmt.Sprintf("%s-", m["instance_type"].(string)))
+	buf.WriteString(fmt.Sprintf("%s-", m["azs"].(*schema.Set).GoString()))
 
 	// TODO(saamalik) fix for disk
 	//buf.WriteString(fmt.Sprintf("%d-", d["size_gb"].(int)))

diff --git a/spectrocloud/resource_cluster_azure.go b/spectrocloud/resource_cluster_azure.go
@@ -161,6 +161,14 @@ func resourceClusterAzure() *schema.Resource {
 								},
 							},
 						},
+						"azs": {
+							Type:     schema.TypeSet,
+							Required: true,
+							Set:      schema.HashString,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
 					},
 				},
 			},
@@ -274,6 +282,8 @@ func flattenMachinePoolConfigsAzure(machinePools []*models.V1alpha1AzureMachineP
 		oi["update_strategy"] = machinePool.UpdateStrategy.Type
 		oi["instance_type"] = machinePool.InstanceType
 
+		oi["azs"] = machinePool.Azs
+
 		if machinePool.OsDisk != nil {
 			d := make(map[string]interface{})
 			d["size_gb"] = machinePool.OsDisk.DiskSizeGB
@@ -425,9 +435,14 @@ func toMachinePoolAzure(machinePool interface{}) *models.V1alpha1AzureMachinePoo
 		diskType = disk0["type"].(string)
 	}
 
+	azs := make([]string, 0)
+	for _, az := range m["azs"].(*schema.Set).List() {
+		azs = append(azs, az.(string))
+	}
+
 	mp := &models.V1alpha1AzureMachinePoolConfigEntity{
 		CloudConfig: &models.V1alpha1AzureMachinePoolCloudConfigEntity{
-			//Azs:          nil,
+			Azs:          azs,
 			InstanceType: m["instance_type"].(string),
 			OsDisk: &models.V1alpha1AzureOSDisk{
 				DiskSizeGB: int32(diskSize),