Skip to content

Commit 9c39589

Browse files
committed
fix: missing windows family in node cfg
1 parent b705681 commit 9c39589

File tree

3 files changed

+36
-5
lines changed

3 files changed

+36
-5
lines changed

castai/resource_node_configuration.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ const (
5858
const (
5959
aksImageFamilyUbuntu = "ubuntu"
6060
aksImageFamilyAzureLinux = "azure-linux"
61+
aksImageFamilyWindows2019 = "windows2019"
62+
aksImageFamilyWindows2022 = "windows2022"
6163
aksEphemeralDiskPlacementCacheDisk = "cacheDisk"
6264
aksEphemeralDiskPlacementResourceDisk = "resourceDisk"
6365
aksDiskCacheReadOnly = "ReadOnly"
@@ -334,8 +336,8 @@ func resourceNodeConfiguration() *schema.Resource {
334336
"If both image and family are provided, the system will use provided image and provisioning logic for given family. "+
335337
"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. "+
336338
"If image family is omitted, a default family (based on cloud provider) will be used. "+
337-
"See Cast.ai documentation for details. Possible values: (%v)", strings.Join([]string{aksImageFamilyUbuntu, aksImageFamilyAzureLinux}, ",")),
338-
ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{aksImageFamilyUbuntu, aksImageFamilyAzureLinux}, true)),
339+
"See Cast.ai documentation for details. Possible values: (%v)", strings.Join([]string{aksImageFamilyUbuntu, aksImageFamilyAzureLinux, aksImageFamilyWindows2019, aksImageFamilyWindows2022}, ",")),
340+
ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{aksImageFamilyUbuntu, aksImageFamilyAzureLinux, aksImageFamilyWindows2019, aksImageFamilyWindows2022}, true)),
339341
DiffSuppressFunc: func(k, oldValue, newValue string, d *schema.ResourceData) bool {
340342
return strings.EqualFold(oldValue, newValue)
341343
},
@@ -1268,6 +1270,10 @@ func toAKSImageFamily(v string) *sdk.NodeconfigV1AKSConfigImageFamily {
12681270
return lo.ToPtr(sdk.NodeconfigV1AKSConfigImageFamilyFAMILYUBUNTU)
12691271
case aksImageFamilyAzureLinux:
12701272
return lo.ToPtr(sdk.NodeconfigV1AKSConfigImageFamilyFAMILYAZURELINUX)
1273+
case aksImageFamilyWindows2019:
1274+
return lo.ToPtr(sdk.NodeconfigV1AKSConfigImageFamilyFAMILYWINDOWS2019)
1275+
case aksImageFamilyWindows2022:
1276+
return lo.ToPtr(sdk.NodeconfigV1AKSConfigImageFamilyFAMILYWINDOWS2022)
12711277
default:
12721278
return nil
12731279
}
@@ -1441,6 +1447,10 @@ func fromAKSImageFamily(family sdk.NodeconfigV1AKSConfigImageFamily) string {
14411447
return aksImageFamilyAzureLinux
14421448
case sdk.NodeconfigV1AKSConfigImageFamilyFAMILYUBUNTU, sdk.NodeconfigV1AKSConfigImageFamilyFamilyUbuntu:
14431449
return aksImageFamilyUbuntu
1450+
case sdk.NodeconfigV1AKSConfigImageFamilyFAMILYWINDOWS2019, sdk.NodeconfigV1AKSConfigImageFamilyFamilyWindows2019:
1451+
return aksImageFamilyWindows2019
1452+
case sdk.NodeconfigV1AKSConfigImageFamilyFamilyWindows2022, sdk.NodeconfigV1AKSConfigImageFamilyFAMILYWINDOWS2022:
1453+
return aksImageFamilyWindows2022
14441454
default:
14451455
return ""
14461456
}

castai/sdk/api.gen.go

Lines changed: 23 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/resources/node_configuration.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)