Skip to content

Commit 05ec33d

Browse files
pjlewisukpjlewisuk
authored
- Added branch variable to allow workflows to build off current branch for PRs
- Reverted AKS API version to 2024-01-01
1 parent 1151d92 commit 05ec33d

File tree

12 files changed

+39
-38
lines changed

12 files changed

+39
-38
lines changed

‎.github/workflows/StandardCI.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ 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+
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
35+
ParamFilePath: "https://raw.githubusercontent.com/Azure/AKS-Construction/${{ BRANCH_NAME }}/.github/workflows_dep/AksDeploy-Basic.parameters.json" # ".github/workflows_dep/AksDeploy-Basic.parameters.json" #Path to parameter file
3536
RESNAME: "AksStan" #Used in Azure Resource Naming, overrides the default in the parameter file
3637
DEPNAME: "Dep${{ github.run_number }}" #Deployment Name
3738
AZCLIVERSION: 2.53.0 #2.43.0 #2.34.1 #2.29.2 #2.26.0 #latest

‎bicep/aksagentpool.bicep

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ var spotProperties = {
6363
// Default OS Disk Size in GB for Linux is 30, for Windows is 100
6464
var defaultOsDiskSizeGB = osType == 'Linux' ? 30 : 100
6565

66-
resource aks 'Microsoft.ContainerService/managedClusters@2023-11-01' existing = {
66+
resource aks 'Microsoft.ContainerService/managedClusters@2024-01-01' existing = {
6767
name: AksName
6868
}
6969

70-
resource userNodepool 'Microsoft.ContainerService/managedClusters/agentPools@2023-11-01' = {
70+
resource userNodepool 'Microsoft.ContainerService/managedClusters/agentPools@2024-01-01' = {
7171
parent: aks
7272
name: PoolName
7373
properties: union({

‎bicep/automationrunbook/aksRbac.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
param principalId string
22
param aksName string
33

4-
resource aks 'Microsoft.ContainerService/managedClusters@2023-11-01' existing = {
4+
resource aks 'Microsoft.ContainerService/managedClusters@2024-01-01' existing = {
55
name: aksName
66
}
77

‎bicep/main.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1337,7 +1337,7 @@ keyVaultKmsCreateAndPrereqs || !empty(keyVaultKmsByoKeyId) ? azureKeyVaultKms :
13371337
!empty(serviceMeshProfile) ? { serviceMeshProfile: serviceMeshProfileObj } : {}
13381338
)
13391339

1340-
resource aks 'Microsoft.ContainerService/managedClusters@2023-11-01' = {
1340+
resource aks 'Microsoft.ContainerService/managedClusters@2024-01-01' = {
13411341
name: 'aks-${resourceName}'
13421342
location: location
13431343
properties: aksProperties

‎samples/SampleAppMain.json

Lines changed: 14 additions & 14 deletions
Large diffs are not rendered by default.

‎samples/SystemPresetExample.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,7 @@
12431243
"properties": {
12441244
"roleDefinitionId": "[variables('AcrPullRole')]",
12451245
"principalType": "ServicePrincipal",
1246-
"principalId": "[reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2023-11-01').identityProfile.kubeletidentity.objectId]"
1246+
"principalId": "[reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2024-01-01').identityProfile.kubeletidentity.objectId]"
12471247
},
12481248
"dependsOn": [
12491249
"[resourceId('Microsoft.ContainerRegistry/registries', variables('acrName'))]",
@@ -1316,7 +1316,7 @@
13161316
"properties": {
13171317
"roleDefinitionId": "[variables('contributor')]",
13181318
"principalType": "ServicePrincipal",
1319-
"principalId": "[reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2023-11-01').addonProfiles.ingressApplicationGateway.identity.objectId]"
1319+
"principalId": "[reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2024-01-01').addonProfiles.ingressApplicationGateway.identity.objectId]"
13201320
},
13211321
"dependsOn": [
13221322
"[resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName')))]",
@@ -1331,7 +1331,7 @@
13311331
"properties": {
13321332
"roleDefinitionId": "[variables('reader')]",
13331333
"principalType": "ServicePrincipal",
1334-
"principalId": "[reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2023-11-01').addonProfiles.ingressApplicationGateway.identity.objectId]"
1334+
"principalId": "[reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2024-01-01').addonProfiles.ingressApplicationGateway.identity.objectId]"
13351335
},
13361336
"dependsOn": [
13371337
"[resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName')))]"
@@ -1346,7 +1346,7 @@
13461346
"properties": {
13471347
"roleDefinitionId": "[variables('managedIdentityOperator')]",
13481348
"principalType": "ServicePrincipal",
1349-
"principalId": "[reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2023-11-01').addonProfiles.ingressApplicationGateway.identity.objectId]"
1349+
"principalId": "[reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2024-01-01').addonProfiles.ingressApplicationGateway.identity.objectId]"
13501350
},
13511351
"dependsOn": [
13521352
"[resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName')))]",
@@ -1656,7 +1656,7 @@
16561656
"name": "[guid(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), 'omsagent', variables('MonitoringMetricsPublisherRole'))]",
16571657
"properties": {
16581658
"roleDefinitionId": "[variables('MonitoringMetricsPublisherRole')]",
1659-
"principalId": "[reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2023-11-01').addonProfiles.omsagent.identity.objectId]",
1659+
"principalId": "[reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2024-01-01').addonProfiles.omsagent.identity.objectId]",
16601660
"principalType": "ServicePrincipal"
16611661
},
16621662
"dependsOn": [
@@ -5442,7 +5442,7 @@
54425442
},
54435443
"vnetId": "[if(variables('isDnsZonePrivate'), if(not(empty(parameters('byoAKSSubnetId'))), createObject('value', split(parameters('byoAKSSubnetId'), '/subnets')[0]), if(parameters('custom_vnet'), createObject('value', reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-network', deployment().name), 64)), '2022-09-01').outputs.vnetId.value), createObject('value', ''))), createObject('value', ''))]",
54445444
"principalId": {
5445-
"value": "[reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2023-11-01').identityProfile.kubeletidentity.objectId]"
5445+
"value": "[reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2024-01-01').identityProfile.kubeletidentity.objectId]"
54465446
}
54475447
},
54485448
"template": {
@@ -5765,7 +5765,7 @@
57655765
"parameters": {
57665766
"keyVaultName": "[if(parameters('keyVaultCreate'), createObject('value', reference(resourceId('Microsoft.Resources/deployments', take(format('{0}-keyvaultApps', deployment().name), 64)), '2022-09-01').outputs.keyVaultName.value), createObject('value', ''))]",
57675767
"rbacSecretUserSps": {
5768-
"value": "[union(createArray(if(and(variables('deployAppGw'), parameters('appgwKVIntegration')), reference(resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', format('id-appgw-{0}', parameters('resourceName'))), '2023-01-31').principalId, '')), createArray(if(parameters('keyVaultAksCSI'), reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2023-11-01').addonProfiles.azureKeyvaultSecretsProvider.identity.objectId, '')))]"
5768+
"value": "[union(createArray(if(and(variables('deployAppGw'), parameters('appgwKVIntegration')), reference(resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', format('id-appgw-{0}', parameters('resourceName'))), '2023-01-31').principalId, '')), createArray(if(parameters('keyVaultAksCSI'), reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2024-01-01').addonProfiles.azureKeyvaultSecretsProvider.identity.objectId, '')))]"
57695769
},
57705770
"rbacSecretOfficerSps": "[if(and(not(empty(parameters('keyVaultOfficerRolePrincipalId'))), parameters('automatedDeployment')), createObject('value', variables('keyVaultOfficerRolePrincipalIds')), createObject('value', createArray()))]",
57715771
"rbacCertOfficerSps": "[if(and(not(empty(parameters('keyVaultOfficerRolePrincipalId'))), parameters('automatedDeployment')), createObject('value', variables('keyVaultOfficerRolePrincipalIds')), createObject('value', createArray()))]",
@@ -7821,7 +7821,7 @@
78217821
"resources": [
78227822
{
78237823
"type": "Microsoft.ContainerService/managedClusters/agentPools",
7824-
"apiVersion": "2023-11-01",
7824+
"apiVersion": "2024-01-01",
78257825
"name": "[format('{0}/{1}', parameters('AksName'), parameters('PoolName'))]",
78267826
"properties": {
78277827
"mode": "User",
@@ -8918,27 +8918,27 @@
89188918
},
89198919
"privateFQDN": {
89208920
"type": "string",
8921-
"value": "[if(and(parameters('enablePrivateCluster'), not(equals(parameters('privateClusterDnsMethod'), 'none'))), reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2023-11-01').privateFQDN, '')]"
8921+
"value": "[if(and(parameters('enablePrivateCluster'), not(equals(parameters('privateClusterDnsMethod'), 'none'))), reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2024-01-01').privateFQDN, '')]"
89228922
},
89238923
"aksPrivateDnsZoneName": {
89248924
"type": "string",
8925-
"value": "[if(and(parameters('enablePrivateCluster'), not(equals(parameters('privateClusterDnsMethod'), 'none'))), join(skip(split(reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2023-11-01').privateFQDN, '.'), 1), '.'), '')]"
8925+
"value": "[if(and(parameters('enablePrivateCluster'), not(equals(parameters('privateClusterDnsMethod'), 'none'))), join(skip(split(reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2024-01-01').privateFQDN, '.'), 1), '.'), '')]"
89268926
},
89278927
"aksClusterName": {
89288928
"type": "string",
89298929
"value": "[format('aks-{0}', parameters('resourceName'))]"
89308930
},
89318931
"aksOidcIssuerUrl": {
89328932
"type": "string",
8933-
"value": "[if(parameters('oidcIssuer'), reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2023-11-01').oidcIssuerProfile.issuerURL, '')]"
8933+
"value": "[if(parameters('oidcIssuer'), reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2024-01-01').oidcIssuerProfile.issuerURL, '')]"
89348934
},
89358935
"aksOidcFedIdentityProperties": {
89368936
"type": "object",
89378937
"metadata": {
89388938
"description": "This output can be directly leveraged when creating a ManagedId Federated Identity"
89398939
},
89408940
"value": {
8941-
"issuer": "[if(parameters('oidcIssuer'), reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2023-11-01').oidcIssuerProfile.issuerURL, '')]",
8941+
"issuer": "[if(parameters('oidcIssuer'), reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2024-01-01').oidcIssuerProfile.issuerURL, '')]",
89428942
"audiences": [
89438943
"api://AzureADTokenExchange"
89448944
],
@@ -8950,7 +8950,7 @@
89508950
"metadata": {
89518951
"description": "The name of the managed resource group AKS uses"
89528952
},
8953-
"value": "[reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2023-11-01').nodeResourceGroup]"
8953+
"value": "[reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2024-01-01').nodeResourceGroup]"
89548954
},
89558955
"aksResourceId": {
89568956
"type": "string",

‎samples/deploy-stages/stage3-acrrbac.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ param acrName string
66
var AcrPullRole = subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7f951dda-4ed3-4680-a7ca-43fe172d538d')
77
var KubeletObjectId = any(aks.properties.identityProfile.kubeletidentity).objectId
88

9-
resource aks 'Microsoft.ContainerService/managedClusters@2023-11-01' existing = {
9+
resource aks 'Microsoft.ContainerService/managedClusters@2024-01-01' existing = {
1010
name: aksName
1111
}
1212

‎samples/deploy-stages/stage4-aksrbac.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ param aadUserObjectId string = ''
66

77
var rbacClusterAdmin = subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b1ff04bb-8a4e-4dc4-8eb5-8693973ce19b')
88

9-
resource aks 'Microsoft.ContainerService/managedClusters@2023-11-01' existing = {
9+
resource aks 'Microsoft.ContainerService/managedClusters@2024-01-01' existing = {
1010
name: aksName
1111
}
1212

‎samples/flux/configpatterns/fluxConfig-InfraAndApps.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ param aksName string
22

33
param aksFluxAddOnReleaseNamespace string = 'flux-system'
44

5-
resource aks 'Microsoft.ContainerService/managedClusters@2023-11-01' existing = {
5+
resource aks 'Microsoft.ContainerService/managedClusters@2024-01-01' existing = {
66
name: aksName
77
}
88

‎samples/flux/configpatterns/fluxConfig-Unified.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ param aksName string
22

33
param aksFluxAddOnReleaseNamespace string = 'flux-system'
44

5-
resource aks 'Microsoft.ContainerService/managedClusters@2023-11-01' existing = {
5+
resource aks 'Microsoft.ContainerService/managedClusters@2024-01-01' existing = {
66
name: aksName
77
}
88

‎samples/shared-acr/acr-rbac.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ resource acr 'Microsoft.ContainerRegistry/registries@2021-06-01-preview' existin
88
}
99

1010
//Create a reference to the existing AKS
11-
resource aks 'Microsoft.ContainerService/managedClusters@2023-11-01' existing = {
11+
resource aks 'Microsoft.ContainerService/managedClusters@2024-01-01' existing = {
1212
name: aksName
1313
scope: resourceGroup(aksResourceGroup)
1414
}

‎samples/shared-acr/main.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1269,7 +1269,7 @@
12691269
"properties": {
12701270
"roleDefinitionId": "[variables('AcrPullRole')]",
12711271
"principalType": "ServicePrincipal",
1272-
"principalId": "[reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2023-11-01').identityProfile.kubeletidentity.objectId]"
1272+
"principalId": "[reference(resourceId('Microsoft.ContainerService/managedClusters', format('aks-{0}', parameters('resourceName'))), '2024-01-01').identityProfile.kubeletidentity.objectId]"
12731273
},
12741274
"dependsOn": [
12751275
"[resourceId('Microsoft.ContainerRegistry/registries', variables('acrName'))]",

0 commit comments

Comments
 (0)