Skip to content

Commit

Permalink
Initial commit. (#659)
Browse files Browse the repository at this point in the history
Co-authored-by: Paul Lewis <pjlewisuk@users.noreply.github.com>
  • Loading branch information
samaea and pjlewisuk committed Nov 16, 2023
1 parent 4e88759 commit 93e358a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion bicep/aksagentpool.bicep
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
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
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

0 comments on commit 93e358a

Please sign in to comment.