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.

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

KUBE-422: [AKS] adding support of AzureLinux #369

Merged
merged 1 commit into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions castai/resource_node_configuration.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ const (
FieldNodeConfigurationKOPS = "kops"
FieldNodeConfigurationGKE = "gke"
FieldNodeConfigurationEKSTargetGroup = "target_group"
FieldNodeConfigurationAKSImageFamily = "aks_image_family"
FieldNodeConfigurationEKSImageFamily = "eks_image_family"
)

Expand All @@ -47,6 +48,10 @@ const (
eksImageFamilyAL2023 = "al2023"
eksImageFamilyBottlerocket = "bottlerocket"
)
const (
aksImageFamilyUbuntu = "ubuntu"
aksImageFamilyAzureLinux = "azure-linux"
)

func resourceNodeConfiguration() *schema.Resource {
return &schema.Resource{
Expand Down Expand Up @@ -296,6 +301,20 @@ func resourceNodeConfiguration() *schema.Resource {
Description: "Type of managed os disk attached to the node. (See [disk types](https://learn.microsoft.com/en-us/azure/virtual-machines/disks-types)). One of: standard, standard-ssd, premium-ssd (ultra and premium-ssd-v2 are not supported for os disk)",
ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{"standard", "standard-ssd", "premium-ssd"}, false)),
},
FieldNodeConfigurationAKSImageFamily: {
Type: schema.TypeString,
Optional: true,
Description: fmt.Sprintf(
"Image OS Family to use when provisioning node in AKS. "+
"If both image and family are provided, the system will use provided image and provisioning logic for given family. "+
"If only image family is provided, the system will attempt to resolve the latest image from that family based on kubernetes version and node architecture. "+
"If image family is omitted, a default family (based on cloud provider) will be used. "+
"See Cast.ai documentation for details. Possible values: (%v)", strings.Join([]string{aksImageFamilyUbuntu, aksImageFamilyAzureLinux}, ",")),
ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{aksImageFamilyUbuntu, aksImageFamilyAzureLinux}, true)),
DiffSuppressFunc: func(k, oldValue, newValue string, d *schema.ResourceData) bool {
return strings.EqualFold(oldValue, newValue)
},
},
},
},
},
Expand Down Expand Up @@ -851,6 +870,10 @@ func toAKSSConfig(obj map[string]interface{}) *sdk.NodeconfigV1AKSConfig {
out.OsDiskType = toAKSOSDiskType(v)
}

if v, ok := obj[FieldNodeConfigurationAKSImageFamily].(string); ok {
out.ImageFamily = toAKSImageFamily(v)
}

return out
}

Expand All @@ -871,6 +894,21 @@ func toAKSOSDiskType(v string) *sdk.NodeconfigV1AKSConfigOsDiskType {
}
}

func toAKSImageFamily(v string) *sdk.NodeconfigV1AKSConfigImageFamily {
if v == "" {
return nil
}

switch strings.ToLower(v) {
case aksImageFamilyUbuntu:
return lo.ToPtr(sdk.NodeconfigV1AKSConfigImageFamilyFAMILYUBUNTU)
case aksImageFamilyAzureLinux:
return lo.ToPtr(sdk.NodeconfigV1AKSConfigImageFamilyFAMILYAZURELINUX)
default:
return nil
}
}

func flattenAKSConfig(config *sdk.NodeconfigV1AKSConfig) []map[string]interface{} {
if config == nil {
return nil
Expand All @@ -884,6 +922,10 @@ func flattenAKSConfig(config *sdk.NodeconfigV1AKSConfig) []map[string]interface{
m["os_disk_type"] = fromAKSDiskType(config.OsDiskType)
}

if v := config.ImageFamily; v != nil {
m[FieldNodeConfigurationAKSImageFamily] = fromAKSImageFamily(*v)
}

return []map[string]interface{}{m}
}

Expand All @@ -903,6 +945,16 @@ func fromAKSDiskType(osDiskType *sdk.NodeconfigV1AKSConfigOsDiskType) string {
}
}

func fromAKSImageFamily(family sdk.NodeconfigV1AKSConfigImageFamily) string {
switch family {
case sdk.NodeconfigV1AKSConfigImageFamilyFAMILYAZURELINUX, sdk.NodeconfigV1AKSConfigImageFamilyFamilyAzureLinux:
return aksImageFamilyAzureLinux
case sdk.NodeconfigV1AKSConfigImageFamilyFAMILYUBUNTU, sdk.NodeconfigV1AKSConfigImageFamilyFamilyUbuntu:
return aksImageFamilyUbuntu
default:
return ""
}
}
func toGKEConfig(obj map[string]interface{}) *sdk.NodeconfigV1GKEConfig {
if obj == nil {
return nil
Expand Down
4 changes: 4 additions & 0 deletions castai/resource_node_configuration_aks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ func TestAccResourceNodeConfiguration_aks(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "disk_cpu_ratio", "35"),
resource.TestCheckResourceAttr(resourceName, "min_disk_size", "122"),
resource.TestCheckResourceAttr(resourceName, "aks.0.max_pods_per_node", "31"),
resource.TestCheckResourceAttr(resourceName, "aks.0.aks_image_family", "ubuntu"),
resource.TestCheckResourceAttr(resourceName, "eks.#", "0"),
resource.TestCheckResourceAttr(resourceName, "kops.#", "0"),
resource.TestCheckResourceAttr(resourceName, "gke.#", "0"),
Expand All @@ -41,6 +42,7 @@ func TestAccResourceNodeConfiguration_aks(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "disk_cpu_ratio", "0"),
resource.TestCheckResourceAttr(resourceName, "min_disk_size", "121"),
resource.TestCheckResourceAttr(resourceName, "aks.0.max_pods_per_node", "32"),
resource.TestCheckResourceAttr(resourceName, "aks.0.aks_image_family", "azure-linux"),
resource.TestCheckResourceAttr(resourceName, "eks.#", "0"),
resource.TestCheckResourceAttr(resourceName, "kops.#", "0"),
resource.TestCheckResourceAttr(resourceName, "gke.#", "0"),
Expand Down Expand Up @@ -73,6 +75,7 @@ resource "castai_node_configuration" "test" {
}
aks {
max_pods_per_node = 31
aks_image_family = "ubuntu"
}
}

Expand All @@ -96,6 +99,7 @@ resource "castai_node_configuration" "test" {
}
aks {
max_pods_per_node = 32
aks_image_family = "azure-linux"
}
}
`, rgName, rName))
Expand Down
1 change: 1 addition & 0 deletions docs/resources/node_configuration.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading