Skip to content

Commit d74e60d

Browse files
pjlewisukpjlewisuk
authored
Merge branch 'main' into paullewis-bicep-linter
2 parents 6ed1aae + d0042cd commit d74e60d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+7925
-1363
lines changed

‎.github/workflows/AKSC_Deploy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
templateVersion:
1111
description: 'Template Version'
1212
required: false
13-
default: '0.10.5'
13+
default: '0.10.7'
1414
type: string
1515
rg:
1616
description: 'Resource Group name'

‎.github/workflows/StandardCI.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ on:
3131
- cron: "0 23 * * 2"
3232
env:
3333
RG: "AksBicepAcc-Ci-BasicCluster" #The resource group we're deploying to.
34-
ParamFilePath: "https://raw.githubusercontent.com/Azure/AKS-Construction/main/.github/workflows_dep/AksDeploy-Basic.parameters.json" # ".github/workflows_dep/AksDeploy-Basic.parameters.json" #Path to parameter file
34+
ParamFilePath: "https://raw.githubusercontent.com/Azure/AKS-Construction/${{ github.head_ref || github.ref_name }}/.github/workflows_dep/AksDeploy-Basic.parameters.json" # ".github/workflows_dep/AksDeploy-Basic.parameters.json" #Path to parameter file
3535
RESNAME: "AksStan" #Used in Azure Resource Naming, overrides the default in the parameter file
3636
DEPNAME: "Dep${{ github.run_number }}" #Deployment Name
3737
AZCLIVERSION: 2.53.0 #2.43.0 #2.34.1 #2.29.2 #2.26.0 #latest

‎.github/workflows/release-soft.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jobs:
118118
creds: ${{ secrets.AZURE_CREDENTIALS }}
119119

120120
- name: Build VM Sku json file
121-
timeout-minutes: 3
121+
timeout-minutes: 10
122122
run: |
123123
cd postdeploy/scripts
124124
chmod +x generate-vm-sku-list-v2.sh

‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
creds: ${{ secrets.AZURE_CREDENTIALS }}
5959

6060
- name: Build VM Sku json file
61-
timeout-minutes: 3
61+
timeout-minutes: 10
6262
run: |
6363
cd postdeploy/scripts
6464
chmod +x generate-vm-sku-list-v2.sh

‎.github/workflows_dep/AksDeploy-Basic.parameters.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"value": 1
1616
},
1717
"agentVMSize": {
18-
"value": "Standard_DS3_v2"
18+
"value": "Standard_D4ds_v5"
1919
},
2020
"enable_aad": {
2121
"value": true

‎.github/workflows_dep/AksDeploy-ByoVnet.parameters.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"value": 1
1313
},
1414
"agentVMSize": {
15-
"value": "Standard_DS3_v2"
15+
"value": "Standard_D4ds_v5"
1616
},
1717
"agentCountMax": {
1818
"value": 2

‎.github/workflows_dep/AksDeploy-Private.parameters.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"value": "priv"
1010
},
1111
"agentVMSize": {
12-
"value": "Standard_DS3_v2"
12+
"value": "Standard_D4ds_v5"
1313
},
1414
"agentCountMax": {
1515
"value": 2
@@ -93,7 +93,7 @@
9393
"value": true
9494
},
9595
"aksOutboundTrafficType" : {
96-
"value": "natGateway"
96+
"value": "loadBalancer"
9797
},
9898
"createNatGateway" : {
9999
"value": true

‎.github/workflows_dep/regressionparams/byoKms.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"value": "az-k8s-kmsbyopub"
77
},
88
"agentVMSize": {
9-
"value": "Standard_DS3_v2"
9+
"value": "Standard_D4ds_v5"
1010
},
1111
"JustUseSystemPool": {
1212
"value": true

‎.github/workflows_dep/regressionparams/byoKmsPrivateLink.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"value": "az-k8s-kmsbyopl"
77
},
88
"agentVMSize": {
9-
"value": "Standard_DS3_v2"
9+
"value": "Standard_D4ds_v5"
1010
},
1111
"JustUseSystemPool": {
1212
"value": true

‎.github/workflows_dep/regressionparams/cilium-cni-overlay.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"value": "WestCentralUs"
1010
},
1111
"agentVMSize": {
12-
"value": "Standard_DS3_v2"
12+
"value": "Standard_D4ds_v5"
1313
},
1414
"networkDataplane": {
1515
"value": "cilium"

‎.github/workflows_dep/regressionparams/classic-custom-vnet-plus-firewall.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"value": 1
1010
},
1111
"agentVMSize": {
12-
"value": "Standard_DS3_v2"
12+
"value": "Standard_D4ds_v5"
1313
},
1414
"agentCountMax": {
1515
"value": 3

‎.github/workflows_dep/regressionparams/dapr.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"value": "az-k8s-dapr"
77
},
88
"agentVMSize": {
9-
"value": "Standard_DS3_v2"
9+
"value": "Standard_D4ds_v5"
1010
},
1111
"daprAddon": {
1212
"value": true

‎.github/workflows_dep/regressionparams/defender.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"value": "az-k8s-def"
1111
},
1212
"agentVMSize": {
13-
"value": "Standard_DS3_v2"
13+
"value": "Standard_D4ds_v5"
1414
},
1515
"agentCountMax": {
1616
"value": 3

‎.github/workflows_dep/regressionparams/edgeK8sVersion.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"value": "az-k8s-edged"
77
},
88
"agentVMSize": {
9-
"value": "Standard_DS3_v2"
9+
"value": "Standard_D4ds_v5"
1010
},
1111
"kubernetesVersion": {
1212
"value": "1.26.3"

‎.github/workflows_dep/regressionparams/gitOps.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"value": "az-k8s-flux"
77
},
88
"agentVMSize": {
9-
"value": "Standard_DS3_v2"
9+
"value": "Standard_D4ds_v5"
1010
},
1111
"fluxGitOpsAddon": {
1212
"value": true

‎.github/workflows_dep/regressionparams/managed-private-privatelink.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"value": 1
1010
},
1111
"agentVMSize": {
12-
"value": "Standard_DS3_v2"
12+
"value": "Standard_D4ds_v5"
1313
},
1414
"agentCountMax": {
1515
"value": 5

‎.github/workflows_dep/regressionparams/managed-private.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"value": "az-k8s-3zb3"
77
},
88
"agentVMSize": {
9-
"value": "Standard_DS3_v2"
9+
"value": "Standard_D4ds_v5"
1010
},
1111
"agentCountMax": {
1212
"value": 20

‎.github/workflows_dep/regressionparams/managed-public.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"value": "manpub"
77
},
88
"agentVMSize": {
9-
"value": "Standard_DS3_v2"
9+
"value": "Standard_D4ds_v5"
1010
},
1111
"agentCountMax": {
1212
"value": 1

‎.github/workflows_dep/regressionparams/managedNatGw.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"value": "az-k8s-natgw"
77
},
88
"agentVMSize": {
9-
"value": "Standard_DS3_v2"
9+
"value": "Standard_D4ds_v5"
1010
},
1111
"aksOutboundTrafficType" : {
1212
"value": "natGateway"

‎.github/workflows_dep/regressionparams/open-secure.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"value": "az-k8s-4chu"
77
},
88
"agentVMSize": {
9-
"value": "Standard_DS3_v2"
9+
"value": "Standard_D4ds_v5"
1010
},
1111
"custom_vnet": {
1212
"value": true

‎.github/workflows_dep/regressionparams/optimised-for-well-architected.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"value": "Standard"
1414
},
1515
"agentVMSize": {
16-
"value": "Standard_DS3_v2"
16+
"value": "Standard_D4ds_v5"
1717
},
1818
"agentCountMax": {
1919
"value": 20

‎.github/workflows_dep/regressionparams/publicKms.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"value": "az-k8s-kmspp1"
77
},
88
"agentVMSize": {
9-
"value": "Standard_DS3_v2"
9+
"value": "Standard_D4ds_v5"
1010
},
1111
"JustUseSystemPool": {
1212
"value": true

‎.github/workflows_dep/regressionparams/scale-userpool-from-zero.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"value": 0
1010
},
1111
"agentVMSize": {
12-
"value": "Standard_DS3_v2"
12+
"value": "Standard_D4ds_v5"
1313
},
1414
"agentCountMax": {
1515
"value": 3

‎.github/workflows_dep/regressionparams/simple-simple.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"value": "az-k8s-7zw4"
77
},
88
"agentVMSize": {
9-
"value": "Standard_DS3_v2"
9+
"value": "Standard_D4ds_v5"
1010
}
1111
}
1212
}

‎.github/workflows_dep/regressionparams/the-cheapest-cluster.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"value": 1
1010
},
1111
"agentVMSize": {
12-
"value": "Standard_B2ms"
12+
"value": "Standard_B2s_v2"
1313
},
1414
"agentCountMax": {
1515
"value": 2

‎bicep/main.bicep

+15-13
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ output ApplicationGatewayName string = deployAppGw ? appgw.name : ''
851851
param dnsPrefix string = '${resourceName}-dns'
852852

853853
@description('Kubernetes Version')
854-
param kubernetesVersion string = '1.28.5'
854+
param kubernetesVersion string = '1.29.7'
855855

856856
@description('Enable Azure AD integration on AKS')
857857
param enable_aad bool = false
@@ -904,7 +904,7 @@ param upgradeChannel string = 'none'
904904
param osDiskType string = 'Ephemeral'
905905

906906
@description('VM SKU')
907-
param agentVMSize string = 'Standard_DS3_v2'
907+
param agentVMSize string = 'Standard_D4ds_v5'
908908

909909
@description('Disk size in GB')
910910
param osDiskSizeGB int = 0
@@ -919,7 +919,7 @@ var autoScale = agentCountMax > agentCount
919919
@minLength(3)
920920
@maxLength(12)
921921
@description('Name for user node pool')
922-
param nodePoolName string = 'npuser01'
922+
param nodePoolName string = 'userpool01'
923923

924924
@description('Config the user node pool as a spot instance')
925925
param nodePoolSpot bool = false
@@ -1128,15 +1128,15 @@ var outboundTrafficType = aksOutboundTrafficType=='natGateway' ? ( custom_vnet ?
11281128
@description('System Pool presets are derived from the recommended system pool specs')
11291129
var systemPoolPresets = {
11301130
CostOptimised : {
1131-
vmSize: 'Standard_B4ms'
1131+
vmSize: 'Standard_B4s_v2'
11321132
count: 1
11331133
minCount: 1
11341134
maxCount: 3
11351135
enableAutoScaling: true
11361136
availabilityZones: []
11371137
}
11381138
Standard : {
1139-
vmSize: 'Standard_DS2_v2'
1139+
vmSize: 'Standard_D4ds_v5'
11401140
count: 3
11411141
minCount: 3
11421142
maxCount: 5
@@ -1148,7 +1148,7 @@ var systemPoolPresets = {
11481148
]
11491149
}
11501150
HighSpec : {
1151-
vmSize: 'Standard_D4s_v3'
1151+
vmSize: 'Standard_D8ds_v4'
11521152
count: 3
11531153
minCount: 3
11541154
maxCount: 5
@@ -1162,7 +1162,7 @@ var systemPoolPresets = {
11621162
}
11631163

11641164
var systemPoolBase = {
1165-
name: JustUseSystemPool ? nodePoolName : 'npsystem'
1165+
name: JustUseSystemPool ? nodePoolName : 'agentpool'
11661166
vmSize: agentVMSize
11671167
count: agentCount
11681168
mode: 'System'
@@ -1183,7 +1183,7 @@ var systemPoolBase = {
11831183
var agentPoolProfiles = JustUseSystemPool ? array(systemPoolBase) : concat(array(union(systemPoolBase, SystemPoolType=='Custom' && SystemPoolCustomPreset != {} ? SystemPoolCustomPreset : systemPoolPresets[SystemPoolType])))
11841184

11851185
output userNodePoolName string = nodePoolName
1186-
output systemNodePoolName string = JustUseSystemPool ? nodePoolName : 'npsystem'
1186+
output systemNodePoolName string = JustUseSystemPool ? nodePoolName : 'agentpool'
11871187

11881188
var akssku = AksPaidSkuForSLA ? 'Standard' : 'Free'
11891189

@@ -1244,11 +1244,13 @@ output aksPrivateDnsZoneName string = enablePrivateCluster && privateClusterDns
12441244

12451245
@description('Needing to seperately declare and union this because of https://github.com/Azure/AKS-Construction/issues/344')
12461246
var managedNATGatewayProfile = {
1247-
natGatewayProfile : {
1248-
managedOutboundIPProfile: {
1249-
count: natGwIpCount
1247+
networkProfile: {
1248+
natGatewayProfile : {
1249+
managedOutboundIPProfile: {
1250+
count: natGwIpCount
1251+
}
1252+
idleTimeoutInMinutes: natGwIdleTimeout
12501253
}
1251-
idleTimeoutInMinutes: natGwIdleTimeout
12521254
}
12531255
}
12541256

@@ -1375,7 +1377,7 @@ param osSKU string = 'Ubuntu'
13751377
var poolName = osType == 'Linux' ? nodePoolName : take(nodePoolName, 6)
13761378

13771379
// Default OS Disk Size in GB for Linux is 30, for Windows is 100
1378-
var defaultOsDiskSizeGB = osType == 'Linux' ? 30 : 100
1380+
var defaultOsDiskSizeGB = 128
13791381

13801382
module userNodePool '../bicep/aksagentpool.bicep' = if (!JustUseSystemPool){
13811383
name: take('${deployment().name}-userNodePool',64)

‎cspell.json

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"aadgroupids",
1212
"accv",
1313
"ACRNAME",
14+
"agentpool",
1415
"AGIC",
1516
"aksc",
1617
"aksvnetparams",
@@ -138,6 +139,7 @@
138139
"updatevals",
139140
"urlname",
140141
"userauth",
142+
"userpool",
141143
"valres",
142144
"vaultname",
143145
"VNET",

‎helper/src/components/clusterTab.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export default function ({ defaults, tabValues, updateFn, featureFlag, invalidAr
3333
console.log (`maxCount=${newp.maxCount} MIN=${MAXCOUNT_MIN}`)
3434

3535
if(newp.SystemPoolType!=='none' && !cluster.nodepoolName){
36-
cluster.nodepoolName = 'npuser01'
36+
cluster.nodepoolName = 'userpool01'
3737
}
3838

3939
if (newp.maxCount < MAXCOUNT_MIN) {
@@ -165,7 +165,7 @@ export default function ({ defaults, tabValues, updateFn, featureFlag, invalidAr
165165
onChange={(val, range) => sliderUpdateFn(cluster.autoscale ? {agentCount: range[0], maxCount: range[1]} : {agentCount: val})} />
166166

167167
<TextField
168-
placeholder='npuser01'
168+
placeholder='userpool01'
169169
label="Node pool name"
170170
maxLength={cluster.osType==='Windows' ? 6 : 12}
171171
onChange={(ev, val) => updateFn('nodepoolName', val)}

‎helper/src/config.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"deploy": {
1111
"enableTelemetry": true,
1212
"managedNodeResourceGroup": "",
13-
"kubernetesVersion": "1.28.5",
14-
"location": "WestEurope",
13+
"kubernetesVersion": "1.29.7",
14+
"location": "westeurope",
1515
"apiips": "",
1616
"demoapp": false,
1717
"disablePreviews": false,
@@ -44,13 +44,13 @@
4444
"osSKU": "Ubuntu",
4545
"upgradeChannel": "none",
4646
"SystemPoolType": "CostOptimised",
47-
"nodepoolName": "npuser01",
48-
"systemNodepoolName": "npsystem",
47+
"nodepoolName": "userpool01",
48+
"systemNodepoolName": "agentpool",
4949
"agentCount": 3,
5050
"maxCount": 20,
5151
"computeType": "gp",
52-
"vmSize": "Standard_DS3_v2",
53-
"osDiskSizeGB": 30,
52+
"vmSize": "Standard_D4ds_v5",
53+
"osDiskSizeGB": 128,
5454
"osDiskType": "Ephemeral",
5555
"enable_aad": true,
5656
"AksDisableLocalAccounts": false,

0 commit comments

Comments
 (0)