From 29691d3b59295d098400223743359671b325b11c Mon Sep 17 00:00:00 2001 From: Gordon Byers Date: Thu, 17 Aug 2023 16:59:24 +0000 Subject: [PATCH 1/2] api bumps --- bicep/main.bicep | 2 +- bicep/network.bicep | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bicep/main.bicep b/bicep/main.bicep index b7b8af46c..0f03dc709 100644 --- a/bicep/main.bicep +++ b/bicep/main.bicep @@ -1336,7 +1336,7 @@ keyVaultKmsCreateAndPrereqs || !empty(keyVaultKmsByoKeyId) ? azureKeyVaultKms : !empty(serviceMeshProfile) ? { serviceMeshProfile: serviceMeshProfileObj } : {} ) -resource aks 'Microsoft.ContainerService/managedClusters@2023-05-02-preview' = { +resource aks 'Microsoft.ContainerService/managedClusters@2023-06-01' = { name: 'aks-${resourceName}' location: location properties: aksProperties diff --git a/bicep/network.bicep b/bicep/network.bicep index 81fe61d80..98550ba6b 100644 --- a/bicep/network.bicep +++ b/bicep/network.bicep @@ -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: { @@ -279,7 +279,7 @@ resource privateDnsAcrLink 'Microsoft.Network/privateDnsZones/virtualNetworkLink } } -resource privateDnsAcrZoneGroup 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2021-08-01' = if (!empty(privateLinkAcrId)) { +resource privateDnsAcrZoneGroup 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2023-04-01' = if (!empty(privateLinkAcrId)) { parent: privateLinkAcr name: 'default' properties: { @@ -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: { @@ -337,7 +337,7 @@ resource privateDnsAkvLink 'Microsoft.Network/privateDnsZones/virtualNetworkLink } } -resource privateDnsAkvZoneGroup 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2021-08-01' = if (!empty(privateLinkAkvId)) { +resource privateDnsAkvZoneGroup 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2023-04-01' = if (!empty(privateLinkAkvId)) { parent: privateLinkAkv name: 'default' properties: { @@ -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@2023-01-01' = if(CreateNsgFlowLogs && networkSecurityGroups) { name: flowLogStorageName kind: 'StorageV2' sku: { @@ -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: { @@ -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: { From a9bdcbb0d090f7a82119c06251de8ca3b1ca1fc2 Mon Sep 17 00:00:00 2001 From: Gordon Byers Date: Wed, 25 Oct 2023 12:49:16 +0000 Subject: [PATCH 2/2] Updated for bicep 0.22.6 --- bicep/acragentpool.bicep | 2 +- bicep/aksagentpool.bicep | 4 ++-- bicep/bicepconfig.json | 6 ++++++ bicep/main.bicep | 5 +++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/bicep/acragentpool.bicep b/bicep/acragentpool.bicep index 2b45b0e65..7fcade9be 100644 --- a/bicep/acragentpool.bicep +++ b/bicep/acragentpool.bicep @@ -2,7 +2,7 @@ param location string = resourceGroup().location param acrName string param acrPoolSubnetId string = '' -resource acr 'Microsoft.ContainerRegistry/registries@2023-01-01-preview' existing = { +resource acr 'Microsoft.ContainerRegistry/registries@2023-07-01' existing = { name: acrName } diff --git a/bicep/aksagentpool.bicep b/bicep/aksagentpool.bicep index 6fba74382..af865c8ed 100644 --- a/bicep/aksagentpool.bicep +++ b/bicep/aksagentpool.bicep @@ -51,11 +51,11 @@ param autoTaintWindows bool = false var taints = autoTaintWindows ? union(nodeTaints, ['sku=Windows:NoSchedule']) : nodeTaints -resource aks 'Microsoft.ContainerService/managedClusters@2021-10-01' existing = { +resource aks 'Microsoft.ContainerService/managedClusters@2023-08-02-preview' existing = { name: AksName } -resource userNodepool 'Microsoft.ContainerService/managedClusters/agentPools@2021-10-01' = { +resource userNodepool 'Microsoft.ContainerService/managedClusters/agentPools@2023-08-02-preview' = { parent: aks name: PoolName properties: { diff --git a/bicep/bicepconfig.json b/bicep/bicepconfig.json index eac32d5e8..221495e72 100644 --- a/bicep/bicepconfig.json +++ b/bicep/bicepconfig.json @@ -5,6 +5,12 @@ "enabled": true, "verbose": false, "rules": { + "prefer-unquoted-property-names" : { + "level": "warning" + }, + "use-parent-property" : { + "level": "warning" + }, "use-recent-api-versions" : { "level": "warning" }, diff --git a/bicep/main.bicep b/bicep/main.bicep index 0f03dc709..4ed5997e3 100644 --- a/bicep/main.bicep +++ b/bicep/main.bicep @@ -410,7 +410,7 @@ param acrUntaggedRetentionPolicy int = 30 var acrName = 'cr${replace(resourceName, '-', '')}${uniqueString(resourceGroup().id, resourceName)}' -resource acr 'Microsoft.ContainerRegistry/registries@2023-01-01-preview' = if (!empty(registries_sku)) { +resource acr 'Microsoft.ContainerRegistry/registries@2023-07-01' = if (!empty(registries_sku)) { name: acrName location: location sku: { @@ -1786,7 +1786,8 @@ var telemetryId = '3c1e2fc6-1c4b-44f9-8694-25d00ae30a3a-${location}' |__| |_______||_______||_______||__| |__| |_______| |__| | _| `._____| |__| |_______/ |_______|| _| |_______| \______/ |__| |__| |__| |_______||__| \__| |__| */ // Telemetry Deployment -resource telemetrydeployment 'Microsoft.Resources/deployments@2022-09-01' = if (enableTelemetry) { +#disable-next-line no-deployments-resources +resource telemetrydeployment 'Microsoft.Resources/deployments@2023-07-01' = if (enableTelemetry) { name: telemetryId properties: { mode: 'Incremental'