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

Paullewis/update-bicep-resources #691

Merged
merged 4 commits into from
Apr 9, 2024
Merged

Paullewis/update-bicep-resources #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1546cbb
Updated all GitHub Actions to latest version to update to NodeJS 20
pjlewisuk Apr 9, 2024
b78d4e6
Updated Bicep API versions to latest stable versions
pjlewisuk Apr 9, 2024
29c1a7c
Updated additional Bicep API versions to latest stable versions
pjlewisuk Apr 9, 2024
acaabcf
Merge branch 'main' into paullewis/update-bicep-resources
pjlewisuk Apr 9, 2024
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
4 changes: 2 additions & 2 deletions bicep/aksagentpool.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ var spotProperties = {
// Default OS Disk Size in GB for Linux is 30, for Windows is 100
var defaultOsDiskSizeGB = osType == 'Linux' ? 30 : 100

resource aks 'Microsoft.ContainerService/managedClusters@2023-07-02-preview' existing = {
resource aks 'Microsoft.ContainerService/managedClusters@2024-01-01' existing = {
name: AksName
}

resource userNodepool 'Microsoft.ContainerService/managedClusters/agentPools@2023-08-02-preview' = {
resource userNodepool 'Microsoft.ContainerService/managedClusters/agentPools@2024-01-01' = {
parent: aks
name: PoolName
properties: union({
Expand Down
4 changes: 2 additions & 2 deletions bicep/aksnetcontrib.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ var existingAksVnetName = !empty(byoAKSSubnetId) ? split(byoAKSSubnetId, '/')[8]
resource existingvnet 'Microsoft.Network/virtualNetworks@2023-04-01' existing = {
name: existingAksVnetName
}
resource existingAksSubnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' existing = {
resource existingAksSubnet 'Microsoft.Network/virtualNetworks/subnets@2023-09-01' existing = {
parent: existingvnet
name: existingAksSubnetName
}

resource existingAksPodSubnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' existing = {
resource existingAksPodSubnet 'Microsoft.Network/virtualNetworks/subnets@2023-09-01' existing = {
parent: existingvnet
name: existingAksPodSubnetName
}
Expand Down
2 changes: 1 addition & 1 deletion bicep/automationrunbook/aksRbac.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
param principalId string
param aksName string

resource aks 'Microsoft.ContainerService/managedClusters@2023-05-02-preview' existing = {
resource aks 'Microsoft.ContainerService/managedClusters@2024-01-01' existing = {
name: aksName
}

Expand Down
2 changes: 1 addition & 1 deletion bicep/firewall.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ resource fwPolicy 'Microsoft.Network/firewallPolicies@2023-04-01' = {
}
}

resource fwpRules 'Microsoft.Network/firewallPolicies/ruleCollectionGroups@2022-01-01' = {
resource fwpRules 'Microsoft.Network/firewallPolicies/ruleCollectionGroups@2023-09-01' = {
parent: fwPolicy
name: 'AKSConstructionRuleGroup'
properties: {
Expand Down
6 changes: 3 additions & 3 deletions bicep/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1344,7 +1344,7 @@ keyVaultKmsCreateAndPrereqs || !empty(keyVaultKmsByoKeyId) ? azureKeyVaultKms :
!empty(serviceMeshProfile) ? { serviceMeshProfile: serviceMeshProfileObj } : {}
)

resource aks 'Microsoft.ContainerService/managedClusters@2023-07-02-preview' = {
resource aks 'Microsoft.ContainerService/managedClusters@2024-01-01' = {
name: 'aks-${resourceName}'
location: location
properties: aksProperties
Expand Down Expand Up @@ -1562,7 +1562,7 @@ resource AksDiags 'Microsoft.Insights/diagnosticSettings@2021-05-01-preview' =
}
}

resource sysLog 'Microsoft.Insights/dataCollectionRules@2021-09-01-preview' = if (createLaw && omsagent && enableSysLog) {
resource sysLog 'Microsoft.Insights/dataCollectionRules@2022-06-01' = if (createLaw && omsagent && enableSysLog) {
name: 'MSCI-${location}-${aks.name}'
location: location
kind: 'Linux'
Expand Down Expand Up @@ -1645,7 +1645,7 @@ resource sysLog 'Microsoft.Insights/dataCollectionRules@2021-09-01-preview' = if
}
}

resource association 'Microsoft.Insights/dataCollectionRuleAssociations@2021-09-01-preview' = if (createLaw && omsagent && enableSysLog) {
resource association 'Microsoft.Insights/dataCollectionRuleAssociations@2022-06-01' = if (createLaw && omsagent && enableSysLog) {
name: '${aks.name}-${aks_law.name}-association'
scope: aks
properties: {
Expand Down
2 changes: 1 addition & 1 deletion samples/SampleAppMain.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7643,7 +7643,7 @@
},
{
"type": "Microsoft.Network/firewallPolicies/ruleCollectionGroups",
"apiVersion": "2022-01-01",
"apiVersion": "2023-04-01",
"name": "[format('{0}/{1}', format('afwp-{0}', parameters('resourceName')), 'AKSConstructionRuleGroup')]",
"properties": {
"priority": 200,
Expand Down
2 changes: 1 addition & 1 deletion samples/SystemPresetExample.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7585,7 +7585,7 @@
},
{
"type": "Microsoft.Network/firewallPolicies/ruleCollectionGroups",
"apiVersion": "2022-01-01",
"apiVersion": "2023-04-01",
"name": "[format('{0}/{1}', format('afwp-{0}', parameters('resourceName')), 'AKSConstructionRuleGroup')]",
"properties": {
"priority": 200,
Expand Down
2 changes: 1 addition & 1 deletion samples/deploy-stages/stage3-acrrbac.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ param acrName string
var AcrPullRole = subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7f951dda-4ed3-4680-a7ca-43fe172d538d')
var KubeletObjectId = any(aks.properties.identityProfile.kubeletidentity).objectId

resource aks 'Microsoft.ContainerService/managedClusters@2022-11-02-preview' existing = {
resource aks 'Microsoft.ContainerService/managedClusters@2024-01-01' existing = {
name: aksName
}

Expand Down
2 changes: 1 addition & 1 deletion samples/deploy-stages/stage4-aksrbac.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ param aadUserObjectId string = ''

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

resource aks 'Microsoft.ContainerService/managedClusters@2022-11-02-preview' existing = {
resource aks 'Microsoft.ContainerService/managedClusters@2024-01-01' existing = {
name: aksName
}

Expand Down
2 changes: 1 addition & 1 deletion samples/flux/configpatterns/fluxConfig-InfraAndApps.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ param aksName string

param aksFluxAddOnReleaseNamespace string = 'flux-system'

resource aks 'Microsoft.ContainerService/managedClusters@2022-03-02-preview' existing = {
resource aks 'Microsoft.ContainerService/managedClusters@2024-01-01' existing = {
name: aksName
}

Expand Down
2 changes: 1 addition & 1 deletion samples/flux/configpatterns/fluxConfig-Unified.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ param aksName string

param aksFluxAddOnReleaseNamespace string = 'flux-system'

resource aks 'Microsoft.ContainerService/managedClusters@2022-03-02-preview' existing = {
resource aks 'Microsoft.ContainerService/managedClusters@2024-01-01' existing = {
name: aksName
}

Expand Down
2 changes: 1 addition & 1 deletion samples/shared-acr/acr-rbac.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ resource acr 'Microsoft.ContainerRegistry/registries@2021-06-01-preview' existin
}

//Create a reference to the existing AKS
resource aks 'Microsoft.ContainerService/managedClusters@2021-10-01' existing = {
resource aks 'Microsoft.ContainerService/managedClusters@2024-01-01' existing = {
name: aksName
scope: resourceGroup(aksResourceGroup)
}
Expand Down
2 changes: 1 addition & 1 deletion samples/shared-acr/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7611,7 +7611,7 @@
},
{
"type": "Microsoft.Network/firewallPolicies/ruleCollectionGroups",
"apiVersion": "2022-01-01",
"apiVersion": "2023-04-01",
"name": "[format('{0}/{1}', format('afwp-{0}', parameters('resourceName')), 'AKSConstructionRuleGroup')]",
"properties": {
"priority": 200,
Expand Down
Loading