optional ephemeral os disk placement (#660)

Author: cirisked

castai/resource_aks_cluster_test.go

@@ -462,6 +462,35 @@ func TestAccAKS_ResourceAKSCluster(t *testing.T) {
 					resource.TestCheckResourceAttr(nodeConfResourceName, "gke.#", "0"),
 				),
 			},
+			{
+				Config: testAccAKSNodeConfigurationConfigWithEphemeral(rName, clusterName, resourceGroupName),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(nodeConfResourceName, "name", rName),
+					resource.TestCheckResourceAttr(nodeConfResourceName, "disk_cpu_ratio", "35"),
+					resource.TestCheckResourceAttr(nodeConfResourceName, "min_disk_size", "122"),
+					resource.TestCheckResourceAttr(nodeConfResourceName, "aks.0.max_pods_per_node", "31"),
+					resource.TestCheckResourceAttr(nodeConfResourceName, "aks.0.aks_image_family", "ubuntu"),
+					resource.TestCheckResourceAttr(nodeConfResourceName, "eks.#", "0"),
+					resource.TestCheckResourceAttr(nodeConfResourceName, "kops.#", "0"),
+					resource.TestCheckResourceAttr(nodeConfResourceName, "gke.#", "0"),
+					resource.TestCheckResourceAttr(nodeConfResourceName, "aks.0.ephemeral_os_disk.#", "1"),
+				),
+			},
+			{
+				Config: testAccAKSNodeConfigurationConfigWithEphemeralNVME(rName, clusterName, resourceGroupName),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(nodeConfResourceName, "name", rName),
+					resource.TestCheckResourceAttr(nodeConfResourceName, "disk_cpu_ratio", "35"),
+					resource.TestCheckResourceAttr(nodeConfResourceName, "min_disk_size", "122"),
+					resource.TestCheckResourceAttr(nodeConfResourceName, "aks.0.max_pods_per_node", "31"),
+					resource.TestCheckResourceAttr(nodeConfResourceName, "aks.0.aks_image_family", "ubuntu"),
+					resource.TestCheckResourceAttr(nodeConfResourceName, "eks.#", "0"),
+					resource.TestCheckResourceAttr(nodeConfResourceName, "kops.#", "0"),
+					resource.TestCheckResourceAttr(nodeConfResourceName, "gke.#", "0"),
+					resource.TestCheckResourceAttr(nodeConfResourceName, "aks.0.ephemeral_os_disk.#", "1"),
+					resource.TestCheckResourceAttr(nodeConfResourceName, "aks.0.ephemeral_os_disk.0.placement", "nvmeDisk"),
+				),
+			},
 			{
 				Config: testAccAKSNodeConfigurationUpdated(rName, clusterName, resourceGroupName),
 				Check: resource.ComposeTestCheckFunc(

castai/resource_node_configuration.go

@@ -361,13 +361,14 @@ func resourceNodeConfiguration() *schema.Resource {
 								Schema: map[string]*schema.Schema{
 									"placement": {
 										Type:                  schema.TypeString,
-										Required:              true,
+										Optional:              true,
 										Description:           "Placement of the ephemeral OS disk. One of: cacheDisk, resourceDisk, nvmeDisk",
-										ValidateDiagFunc:      validation.ToDiagFunc(validation.StringInSlice([]string{aksEphemeralDiskPlacementCacheDisk, aksEphemeralDiskPlacementResourceDisk, aksEphemeralDiskPlacementNVME}, true)),
+										ValidateDiagFunc:      validation.ToDiagFunc(validation.StringInSlice([]string{aksEphemeralDiskPlacementCacheDisk, aksEphemeralDiskPlacementResourceDisk, aksEphemeralDiskPlacementNVME, Unspecified}, true)),
 										DiffSuppressOnRefresh: true,
 										DiffSuppressFunc: func(k, oldValue, newValue string, d *schema.ResourceData) bool {
 											return strings.EqualFold(oldValue, newValue)
 										},
+										Default: Unspecified,
 									},
 									"cache": {
 										Type:        schema.TypeString,
@@ -1227,7 +1228,9 @@ func toAKSEphemeralOSDisk(obj any) *sdk.NodeconfigV1AKSConfigOsDiskEphemeral {
 		return nil
 	}
 
-	osDisk := &sdk.NodeconfigV1AKSConfigOsDiskEphemeral{}
+	osDisk := &sdk.NodeconfigV1AKSConfigOsDiskEphemeral{
+		Placement: lo.ToPtr(sdk.NodeconfigV1AKSConfigOsDiskEphemeralPlacementPLACEMENTUNSPECIFIED),
+	}
 
 	if v, ok := obj.(map[string]any)["placement"].(string); ok && v != "" {
 		switch strings.ToLower(v) {
@@ -1416,7 +1419,9 @@ func fromAKSEphemeralOSDisk(sdkEph *sdk.NodeconfigV1AKSConfigOsDiskEphemeral) []
 		return nil
 	}
 
-	m := map[string]interface{}{}
+	m := map[string]interface{}{
+		"placement": Unspecified,
+	}
 	if sdkEph.Placement != nil {
 		switch *sdkEph.Placement {
 		case sdk.NodeconfigV1AKSConfigOsDiskEphemeralPlacementPLACEMENTRESOURCEDISK:

castai/resource_node_configuration_aks_test.go

@@ -83,3 +83,74 @@ resource "castai_node_configuration" "test" {
 }
 `, rName, resourceGroupName))
 }
+
+func testAccAKSNodeConfigurationConfigWithEphemeral(rName, clusterName, resourceGroupName string) string {
+	return ConfigCompose(testAccAKSWithFederationIDConfig(clusterName), fmt.Sprintf(`
+provider "azurerm" {
+	features {}		
+}
+data "azurerm_subnet" "internal" {
+  name                 =  "internal"
+  virtual_network_name = "%[2]s-network"
+  resource_group_name  = %[2]q 
+}
+
+resource "castai_node_configuration" "test" {
+  name   		    = %[1]q
+  cluster_id        = castai_aks_cluster.test.id
+  disk_cpu_ratio    = 35
+  min_disk_size     = 122
+  subnets   	    = [data.azurerm_subnet.internal.id]
+  tags = {
+    env = "development"
+  }
+  aks {
+		max_pods_per_node = 31
+		aks_image_family = "ubuntu"
+		ephemeral_os_disk {
+		}
+  }
+}
+
+resource "castai_node_configuration_default" "test" {
+  cluster_id       = castai_aks_cluster.test.id
+  configuration_id = castai_node_configuration.test.id
+}
+`, rName, resourceGroupName))
+}
+
+func testAccAKSNodeConfigurationConfigWithEphemeralNVME(rName, clusterName, resourceGroupName string) string {
+	return ConfigCompose(testAccAKSWithFederationIDConfig(clusterName), fmt.Sprintf(`
+provider "azurerm" {
+	features {}		
+}
+data "azurerm_subnet" "internal" {
+  name                 =  "internal"
+  virtual_network_name = "%[2]s-network"
+  resource_group_name  = %[2]q 
+}
+
+resource "castai_node_configuration" "test" {
+  name   		    = %[1]q
+  cluster_id        = castai_aks_cluster.test.id
+  disk_cpu_ratio    = 35
+  min_disk_size     = 122
+  subnets   	    = [data.azurerm_subnet.internal.id]
+  tags = {
+    env = "development"
+  }
+  aks {
+		max_pods_per_node = 31
+		aks_image_family = "ubuntu"
+		ephemeral_os_disk {
+			placement = "nvmeDisk"
+		}
+  }
+}
+
+resource "castai_node_configuration_default" "test" {
+  cluster_id       = castai_aks_cluster.test.id
+  configuration_id = castai_node_configuration.test.id
+}
+`, rName, resourceGroupName))
+}