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.

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

Updated bicep api versions #651

Merged
merged 7 commits into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/aksmetricalerts.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ resource PV_usage_violates_the_configured_threshold_for_clustername_CI_21 'micro
}


resource Daily_law_datacap 'Microsoft.Insights/scheduledQueryRules@2022-06-15' = {
resource Daily_law_datacap 'Microsoft.Insights/scheduledQueryRules@2022-08-01-preview' = {
name: 'Daily data cap breached for workspace ${logAnalyticsWorkspaceName} CIQ-1'
location: logAnalyticsWorkspaceLocation
properties: {
Expand Down
2 changes: 1 addition & 1 deletion bicep/aksnetcontrib.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var existingAksPodSubnetName = !empty(byoAKSPodSubnetId) ? split(byoAKSPodSubnet
var existingAksSubnetName = !empty(byoAKSSubnetId) ? split(byoAKSSubnetId, '/')[10] : ''
var existingAksVnetName = !empty(byoAKSSubnetId) ? split(byoAKSSubnetId, '/')[8] : ''

resource existingvnet 'Microsoft.Network/virtualNetworks@2022-07-01' existing = {
resource existingvnet 'Microsoft.Network/virtualNetworks@2023-04-01' existing = {
name: existingAksVnetName
}
resource existingAksSubnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' existing = {
Expand Down
8 changes: 4 additions & 4 deletions bicep/appgw.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ param appGWmaxCount int
var appgwName = 'agw-${resourceName}'
var appgwResourceId = resourceId('Microsoft.Network/applicationGateways', '${appgwName}')

resource appgwpip 'Microsoft.Network/publicIPAddresses@2020-07-01' = {
resource appgwpip 'Microsoft.Network/publicIPAddresses@2023-04-01' = {
name: 'pip-agw-${resourceName}'
location: location
sku: {
Expand Down Expand Up @@ -131,7 +131,7 @@ var appGwZones = !empty(availabilityZones) ? availabilityZones : []

// 'identity' is always set until this is fixed:
// https://github.com/Azure/bicep/issues/387#issuecomment-885671296
resource appgw 'Microsoft.Network/applicationGateways@2020-07-01' = if (!empty(userAssignedIdentity)) {
resource appgw 'Microsoft.Network/applicationGateways@2023-04-01' = if (!empty(userAssignedIdentity)) {
name: appgwName
location: location
zones: appGwZones
Expand All @@ -147,7 +147,7 @@ resource appgw 'Microsoft.Network/applicationGateways@2020-07-01' = if (!empty(u
param agicPrincipleId string
var contributor = subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c')
// https://docs.microsoft.com/en-us/azure/role-based-access-control/role-assignments-template#new-service-principal
resource appGwAGICContrib 'Microsoft.Authorization/roleAssignments@2020-04-01-preview' = {
resource appGwAGICContrib 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: appgw
name: guid(resourceGroup().id, appgwName, 'appgwcont')
properties: {
Expand All @@ -158,7 +158,7 @@ resource appGwAGICContrib 'Microsoft.Authorization/roleAssignments@2020-04-01-pr
}

var reader = subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7')
resource appGwAGICRGReader 'Microsoft.Authorization/roleAssignments@2020-04-01-preview' = {
resource appGwAGICRGReader 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: resourceGroup()
name: guid(resourceGroup().id, appgwName, 'rgread')
properties: {
Expand Down
2 changes: 1 addition & 1 deletion bicep/automationrunbook/aksRbac.bicep
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-03-02-preview' existing = {
resource aks 'Microsoft.ContainerService/managedClusters@2023-05-02-preview' existing = {
name: aksName
}

Expand Down
8 changes: 4 additions & 4 deletions bicep/firewall.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var managementIpConfig = {
}
}

resource fw_pip 'Microsoft.Network/publicIPAddresses@2022-07-01' = {
resource fw_pip 'Microsoft.Network/publicIPAddresses@2023-04-01' = {
name: firewallPublicIpName
location: location
sku: {
Expand All @@ -38,7 +38,7 @@ resource fw_pip 'Microsoft.Network/publicIPAddresses@2022-07-01' = {
}
}

resource fwManagementIp_pip 'Microsoft.Network/publicIPAddresses@2022-07-01' = if(fwSku=='Basic') {
resource fwManagementIp_pip 'Microsoft.Network/publicIPAddresses@2023-04-01' = if(fwSku=='Basic') {
name: firewallManagementPublicIpName
location: location
sku: {
Expand Down Expand Up @@ -91,7 +91,7 @@ resource fwDiags 'Microsoft.Insights/diagnosticSettings@2021-05-01-preview' = if
param appDnsZoneName string = ''

var fw_name = 'afw-${resourceName}'
resource fw 'Microsoft.Network/azureFirewalls@2022-01-01' = {
resource fw 'Microsoft.Network/azureFirewalls@2023-04-01' = {
name: fw_name
location: location
zones: !empty(availabilityZones) ? availabilityZones : []
Expand Down Expand Up @@ -122,7 +122,7 @@ resource fw 'Microsoft.Network/azureFirewalls@2022-01-01' = {
}
}

resource fwPolicy 'Microsoft.Network/firewallPolicies@2022-01-01' = {
resource fwPolicy 'Microsoft.Network/firewallPolicies@2023-04-01' = {
name: 'afwp-${resourceName}'
location: location
properties: {
Expand Down
10 changes: 5 additions & 5 deletions bicep/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ resource appGwIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01
var appgwName = 'agw-${resourceName}'
var appgwResourceId = deployAppGw ? resourceId('Microsoft.Network/applicationGateways', '${appgwName}') : ''

resource appgwpip 'Microsoft.Network/publicIPAddresses@2022-07-01' = if (deployAppGw) {
resource appgwpip 'Microsoft.Network/publicIPAddresses@2023-04-01' = if (deployAppGw) {
name: 'pip-agw-${resourceName}'
location: location
sku: {
Expand Down Expand Up @@ -761,7 +761,7 @@ var appgwProperties = union({
} : {})

// 'identity' is always set until this is fixed: https://github.com/Azure/bicep/issues/387#issuecomment-885671296
resource appgw 'Microsoft.Network/applicationGateways@2022-07-01' = if (deployAppGw) {
resource appgw 'Microsoft.Network/applicationGateways@2023-04-01' = if (deployAppGw) {
name: appgwName
location: location
zones: !empty(availabilityZones) ? availabilityZones : []
Expand Down Expand Up @@ -1554,7 +1554,7 @@ resource AksDiags 'Microsoft.Insights/diagnosticSettings@2021-05-01-preview' =
}
}

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

resource association 'Microsoft.Insights/dataCollectionRuleAssociations@2022-06-01' = if (createLaw && omsagent && enableSysLog) {
resource association 'Microsoft.Insights/dataCollectionRuleAssociations@2021-09-01-preview' = if (createLaw && omsagent && enableSysLog) {
name: '${aks.name}-${aks_law.name}-association'
scope: aks
properties: {
Expand Down Expand Up @@ -1743,7 +1743,7 @@ output LogAnalyticsId string = (createLaw) ? aks_law.id : ''
@description('Create an Event Grid System Topic for AKS events')
param createEventGrid bool = false

resource eventGrid 'Microsoft.EventGrid/systemTopics@2021-12-01' = if(createEventGrid) {
resource eventGrid 'Microsoft.EventGrid/systemTopics@2023-06-01-preview' = if(createEventGrid) {
name: 'evgt-${aks.name}'
location: location
identity: {
Expand Down
18 changes: 9 additions & 9 deletions bicep/network.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ var fwmgmt_subnet = {
}

var routeFwTableName = 'rt-afw-${resourceName}'
resource vnet_udr 'Microsoft.Network/routeTables@2022-07-01' = if (azureFirewalls) {
resource vnet_udr 'Microsoft.Network/routeTables@2023-04-01' = if (azureFirewalls) {
name: routeFwTableName
location: location
properties: {
Expand Down Expand Up @@ -206,7 +206,7 @@ var subnets = union(
output debugSubnets array = subnets

var vnetName = 'vnet-${resourceName}'
resource vnet 'Microsoft.Network/virtualNetworks@2022-07-01' = {
resource vnet 'Microsoft.Network/virtualNetworks@2023-04-01' = {
name: vnetName
location: location
properties: {
Expand Down Expand Up @@ -239,7 +239,7 @@ module aks_vnet_con 'networksubnetrbac.bicep' = if (!empty(aksPrincipleId)) {

/* -------------------------------------------------------------------------- Private Link for ACR */
var privateLinkAcrName = 'pl-acr-${resourceName}'
resource privateLinkAcr 'Microsoft.Network/privateEndpoints@2021-08-01' = if (!empty(privateLinkAcrId)) {
resource privateLinkAcr 'Microsoft.Network/privateEndpoints@2023-04-01' = if (!empty(privateLinkAcrId)) {
name: privateLinkAcrName
location: location
properties: {
Expand Down Expand Up @@ -297,7 +297,7 @@ resource privateDnsAcrZoneGroup 'Microsoft.Network/privateEndpoints/privateDnsZo

/* -------------------------------------------------------------------------- Private Link for KeyVault */
var privateLinkAkvName = 'pl-akv-${resourceName}'
resource privateLinkAkv 'Microsoft.Network/privateEndpoints@2021-08-01' = if (!empty(privateLinkAkvId)) {
resource privateLinkAkv 'Microsoft.Network/privateEndpoints@2023-04-01' = if (!empty(privateLinkAkvId)) {
name: privateLinkAkvName
location: location
properties: {
Expand Down Expand Up @@ -361,7 +361,7 @@ var publicIpAddressName = 'pip-${bastionHostName}'
])
param bastionSku string = 'Standard'

resource bastionPip 'Microsoft.Network/publicIPAddresses@2022-07-01' = if(bastion) {
resource bastionPip 'Microsoft.Network/publicIPAddresses@2023-04-01' = if(bastion) {
name: publicIpAddressName
location: location
sku: {
Expand All @@ -373,7 +373,7 @@ resource bastionPip 'Microsoft.Network/publicIPAddresses@2022-07-01' = if(bastio
}
}

resource bastionHost 'Microsoft.Network/bastionHosts@2022-11-01' = if(bastion) {
resource bastionHost 'Microsoft.Network/bastionHosts@2023-04-01' = if(bastion) {
name: bastionHostName
location: location
sku: {
Expand Down Expand Up @@ -405,7 +405,7 @@ resource log 'Microsoft.OperationalInsights/workspaces@2022-10-01' existing = if
param CreateNsgFlowLogs bool = false

var flowLogStorageName = take(replace(toLower('stflow${resourceName}${uniqueString(resourceGroup().id, resourceName)}'),'-',''),24)
resource flowLogStor 'Microsoft.Storage/storageAccounts@2021-08-01' = if(CreateNsgFlowLogs && networkSecurityGroups) {
resource flowLogStor 'Microsoft.Storage/storageAccounts@2022-09-01' = if(CreateNsgFlowLogs && networkSecurityGroups) {
name: flowLogStorageName
kind: 'StorageV2'
sku: {
Expand Down Expand Up @@ -505,7 +505,7 @@ module nsgPrivateLinks 'nsg.bicep' = if(privateLinks && networkSecurityGroups) {
]
}

resource natGwIp 'Microsoft.Network/publicIPAddresses@2021-08-01' = [for i in range(0, natGatewayPublicIps): if(natGateway) {
resource natGwIp 'Microsoft.Network/publicIPAddresses@2023-04-01' = [for i in range(0, natGatewayPublicIps): if(natGateway) {
name: 'pip-${natGwName}-${i+1}'
location: location
sku: {
Expand All @@ -521,7 +521,7 @@ output natGwIpArr array = [for i in range(0, natGatewayPublicIps): natGateway ?

var natGwName = 'ng-${resourceName}'

resource natGw 'Microsoft.Network/natGateways@2021-08-01' = if(natGateway) {
resource natGw 'Microsoft.Network/natGateways@2023-04-01' = if(natGateway) {
name: natGwName
location: location
sku: {
Expand Down
2 changes: 1 addition & 1 deletion bicep/networkwatcherflowlog.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ param workspaceId string = ''
param workspaceResourceId string = ''
param workspaceRegion string = resourceGroup().location

resource networkWatcher 'Microsoft.Network/networkWatchers@2022-01-01' = {
resource networkWatcher 'Microsoft.Network/networkWatchers@2023-04-01' = {
name: 'NetworkWatcher_${location}'
location: location
properties: {}
Expand Down
2 changes: 1 addition & 1 deletion bicep/nsg.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ param workspaceRegion string = resourceGroup().location

var nsgName = 'nsg-${resourceName}'

resource nsg 'Microsoft.Network/networkSecurityGroups@2022-11-01' = {
resource nsg 'Microsoft.Network/networkSecurityGroups@2023-04-01' = {
name: nsgName
location: location
}
Expand Down