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.

Sign up for GitHub

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

Azure Linux osSKU support in AKSC #659

Merged
merged 7 commits into from
Nov 16, 2023
Merged

Azure Linux osSKU support in AKSC #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9f9825e
Initial commit.
samaea Oct 9, 2023
5873972
Merge branch 'main' into se-azurelinux
pjlewisuk Oct 24, 2023
2abdbed
Merge branch 'main' into se-azurelinux
pjlewisuk Oct 24, 2023
6734aa5
Merge branch 'main' into se-azurelinux
pjlewisuk Oct 25, 2023
6be6558
Merge branch 'main' into se-azurelinux
pjlewisuk Oct 25, 2023
fc3afcc
Merge branch 'main' into se-azurelinux
samaea Oct 26, 2023
0a426b2
Merge branch 'main' into se-azurelinux
pjlewisuk Nov 16, 2023
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
2 changes: 1 addition & 1 deletion bicep/aksagentpool.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
5 changes: 3 additions & 2 deletions bicep/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions helper/src/components/clusterTab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" } }}
Expand Down
Loading