diff --git a/bicep/aksagentpool.bicep b/bicep/aksagentpool.bicep index 493a668a1..fea7171fc 100644 --- a/bicep/aksagentpool.bicep +++ b/bicep/aksagentpool.bicep @@ -40,7 +40,7 @@ param podSubnetID string = '' @allowed(['Linux','Windows']) param osType string -@allowed(['Ubuntu','Windows2019','Windows2022']) +@allowed(['AzureLinux','Ubuntu','Windows2019','Windows2022']) param osSKU string @description('Assign a public IP per node') diff --git a/bicep/main.bicep b/bicep/main.bicep index 28ec1272d..69ba4758c 100644 --- a/bicep/main.bicep +++ b/bicep/main.bicep @@ -1172,6 +1172,7 @@ var systemPoolBase = { count: agentCount mode: 'System' osType: 'Linux' + osSku: osSKU=='AzureLinux' ? osSKU : 'Ubuntu' maxPods: 30 type: 'VirtualMachineScaleSets' vnetSubnetID: !empty(aksSubnetId) ? aksSubnetId : null @@ -1376,8 +1377,8 @@ output aksOidcIssuerUrl string = oidcIssuer ? aks.properties.oidcIssuerProfile.i @description('The User Node pool OS') param osType string = 'Linux' -@allowed(['Ubuntu','Windows2019','Windows2022']) -@description('The User Node pool OS SKU') +@allowed(['AzureLinux','Ubuntu','Windows2019','Windows2022']) +@description('User Node pool OS SKU') param osSKU string = 'Ubuntu' var poolName = osType == 'Linux' ? nodePoolName : take(nodePoolName, 6) diff --git a/helper/src/components/clusterTab.js b/helper/src/components/clusterTab.js index 4abbc04ea..35960f077 100644 --- a/helper/src/components/clusterTab.js +++ b/helper/src/components/clusterTab.js @@ -127,6 +127,7 @@ export default function ({ defaults, tabValues, updateFn, featureFlag, invalidAr onChange={(ev, { key }) => updateFn("osSKU", key)} options={[ { key: 'Ubuntu', text: 'Ubuntu', disabled:cluster.osType!=='Linux' }, + { key: 'AzureLinux', text: 'Azure Linux', disabled:cluster.osType!=='Linux' }, { key: 'Windows2022', text: 'Windows Server 2022', disabled:cluster.osType!=='Windows' } ]} styles={{ dropdown: { width: "100%", minWidth: "200px" } }}